Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2025-01-09 09:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add seamless resize support for Metal renderer

Browse source
This commit is contained in:
Cameron Gutman 2024-02-08 18:05:47 -06:00
parent b972a22459
commit cf3e328f9d
1 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
app/streaming/video/ffmpeg-renderers/vt.mm
View file

@ -114,6 +114,10 @@ public:
m_DisplayLink(nullptr), m_DisplayLink(nullptr),
m_LastColorSpace(-1), m_LastColorSpace(-1),
m_LastFullRange(false), m_LastFullRange(false),
m_LastFrameWidth(-1),
m_LastFrameHeight(-1),
m_LastDrawableWidth(-1),
m_LastDrawableHeight(-1),
m_VsyncMutex(nullptr), m_VsyncMutex(nullptr),
m_VsyncPassed(nullptr) m_VsyncPassed(nullptr)
{ {
@ -289,14 +293,17 @@ public:
bool updateVideoRegionSizeForFrame(AVFrame* frame) bool updateVideoRegionSizeForFrame(AVFrame* frame)
{ {
// TODO: When we support seamless resizing, implement this properly!
if (m_VideoVertexBuffer) {
return true;
}
int drawableWidth, drawableHeight; int drawableWidth, drawableHeight;
SDL_Metal_GetDrawableSize(m_Window, &drawableWidth, &drawableHeight); SDL_Metal_GetDrawableSize(m_Window, &drawableWidth, &drawableHeight);
// Check if anything has changed since the last vertex buffer upload
if (m_VideoVertexBuffer &&
frame->width == m_LastFrameWidth && frame->height == m_LastFrameHeight &&
drawableWidth == m_LastDrawableWidth && drawableHeight == m_LastDrawableHeight) {
// Nothing to do
return true;
}
// Determine the correct scaled size for the video region // Determine the correct scaled size for the video region
SDL_Rect src, dst; SDL_Rect src, dst;
src.x = src.y = 0; src.x = src.y = 0;
@ -327,6 +334,11 @@ public:
return false; return false;
} }
m_LastFrameWidth = frame->width;
m_LastFrameHeight = frame->height;
m_LastDrawableWidth = drawableWidth;
m_LastDrawableHeight = drawableHeight;
return true; return true;
} }
@ -677,9 +689,11 @@ public:
switch (type) { switch (type) {
case Overlay::OverlayDebug: case Overlay::OverlayDebug:
[m_OverlayTextFields[type] setAlignment:NSTextAlignmentLeft]; [m_OverlayTextFields[type] setAlignment:NSTextAlignmentLeft];
[m_OverlayTextFields[type] setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
break; break;
case Overlay::OverlayStatusUpdate: case Overlay::OverlayStatusUpdate:
[m_OverlayTextFields[type] setAlignment:NSTextAlignmentRight]; [m_OverlayTextFields[type] setAlignment:NSTextAlignmentRight];
[m_OverlayTextFields[type] setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
break; break;
default: default:
break; break;
@ -692,6 +706,9 @@ public:
[(NSView*)m_MetalView addSubview: m_OverlayTextFields[type]]; [(NSView*)m_MetalView addSubview: m_OverlayTextFields[type]];
} }
// Update the text field size
[m_OverlayTextFields[type] setFrame:((NSView*)m_MetalView).bounds];
// Update text contents // Update text contents
[m_OverlayTextFields[type] setStringValue: [NSString stringWithUTF8String:Session::get()->getOverlayManager().getOverlayText(type)]]; [m_OverlayTextFields[type] setStringValue: [NSString stringWithUTF8String:Session::get()->getOverlayManager().getOverlayText(type)]];
@ -743,6 +760,22 @@ public:
return RENDERER_ATTRIBUTE_HDR_SUPPORT; return RENDERER_ATTRIBUTE_HDR_SUPPORT;
} }
bool notifyWindowChanged(PWINDOW_STATE_CHANGE_INFO info) override
{
auto unhandledStateFlags = info->stateChangeFlags;
// We can always handle size changes
unhandledStateFlags &= ~WINDOW_STATE_CHANGE_SIZE;
// We can handle monitor changes as long as we are not pacing with a CVDisplayLink
if (m_DisplayLink == nullptr) {
unhandledStateFlags &= ~WINDOW_STATE_CHANGE_DISPLAY;
}
// If nothing is left, we handled everything
return unhandledStateFlags == 0;
}
private: private:
SDL_Window* m_Window; SDL_Window* m_Window;
AVBufferRef* m_HwContext; AVBufferRef* m_HwContext;
@ -759,6 +792,10 @@ private:
CVDisplayLinkRef m_DisplayLink; CVDisplayLinkRef m_DisplayLink;
int m_LastColorSpace; int m_LastColorSpace;
bool m_LastFullRange; bool m_LastFullRange;
int m_LastFrameWidth;
int m_LastFrameHeight;
int m_LastDrawableWidth;
int m_LastDrawableHeight;
SDL_mutex* m_VsyncMutex; SDL_mutex* m_VsyncMutex;
SDL_cond* m_VsyncPassed; SDL_cond* m_VsyncPassed;
}; };