Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2025-03-05 07:07:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small code cleanup for hwframe code

Browse source
This commit is contained in:
Cameron Gutman 2022-01-02 13:58:37 -06:00
parent 17d1ced07c
commit 1e9e96fb8c
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/streaming/video/ffmpeg-renderers/sdlvid.cpp
View file

@ -224,9 +224,6 @@ bool SdlRenderer::initializeReadBackFormat(AVBufferRef* hwFrameCtxRef, AVFrame*
err = av_hwframe_map(outputFrame, testFrame, AV_HWFRAME_MAP_READ); err = av_hwframe_map(outputFrame, testFrame, AV_HWFRAME_MAP_READ);
if (err == 0) { if (err == 0) {
if (isPixelFormatSupported(m_VideoFormat, (AVPixelFormat)outputFrame->format)) { if (isPixelFormatSupported(m_VideoFormat, (AVPixelFormat)outputFrame->format)) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Found supported hwframe mapping format: %d",
outputFrame->format);
m_SwPixelFormat = (AVPixelFormat)outputFrame->format; m_SwPixelFormat = (AVPixelFormat)outputFrame->format;
m_MapFrame = true; m_MapFrame = true;
goto Exit; goto Exit;
@ -238,9 +235,10 @@ bool SdlRenderer::initializeReadBackFormat(AVBufferRef* hwFrameCtxRef, AVFrame*
} }
} }
else { else {
SDL_assert(err == AVERROR(ENOSYS));
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Hwframe mapping is unsupported"); "av_hwframe_map() is unsupported (error: %d)",
err);
SDL_assert(err == AVERROR(ENOSYS));
} }
} }
@ -266,9 +264,6 @@ bool SdlRenderer::initializeReadBackFormat(AVBufferRef* hwFrameCtxRef, AVFrame*
continue; continue;
} }
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Found supported hwframe transfer format: %d",
formats[i]);
m_SwPixelFormat = formats[i]; m_SwPixelFormat = formats[i];
break; break;
} }
@ -285,7 +280,8 @@ Exit:
} }
else { else {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"Unable to find compatible hwframe transfer format"); "Unable to find compatible hwframe transfer format (sw_format = %d)",
hwFrameCtx->sw_format);
return false; return false;
} }
} }
@ -311,6 +307,9 @@ AVFrame* SdlRenderer::getSwFrameFromHwFrame(AVFrame* hwFrame)
swFrame->format = m_SwPixelFormat; swFrame->format = m_SwPixelFormat;
if (m_MapFrame) { if (m_MapFrame) {
// We don't use AV_HWFRAME_MAP_DIRECT here because it can cause huge
// performance penalties on Intel hardware with VAAPI due to mappings
// being uncached memory.
err = av_hwframe_map(swFrame, hwFrame, AV_HWFRAME_MAP_READ); err = av_hwframe_map(swFrame, hwFrame, AV_HWFRAME_MAP_READ);
if (err < 0) { if (err < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,