moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 22:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix streaming with non-aligned resolutions with DXVA2 on my Quadro P400

Browse Source
This commit is contained in:
Cameron Gutman
2018-08-05 15:25:40 -07:00
parent 73dd5630df
commit 6d9c0c96c9
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/ffmpeg-renderers/dxva2.cpp
+22 -18
View File
@@ -199,18 +199,11 @@ bool DXVA2Renderer::initializeDecoder()
return false; return false;
} }
int alignment; // Alignment was already taken care of
SDL_assert(m_Desc.SampleWidth % 16 == 0);
// HEVC using DXVA requires 128B alignment SDL_assert(m_Desc.SampleHeight % 16 == 0);
if (m_VideoFormat & VIDEO_FORMAT_MASK_H265) { hr = m_DecService->CreateSurface(m_Desc.SampleWidth,
alignment = 128; m_Desc.SampleHeight,
}
else {
alignment = 16;
}
hr = m_DecService->CreateSurface(FFALIGN(m_VideoWidth, alignment),
FFALIGN(m_VideoHeight, alignment),
ARRAYSIZE(m_DecSurfaces) - 1, ARRAYSIZE(m_DecSurfaces) - 1,
m_Desc.Format, m_Desc.Format,
D3DPOOL_DEFAULT, D3DPOOL_DEFAULT,
@@ -466,8 +459,19 @@ bool DXVA2Renderer::initialize(SDL_Window* window, int videoFormat, int width, i
SDL_RenderPresent(m_SdlRenderer); SDL_RenderPresent(m_SdlRenderer);
RtlZeroMemory(&m_Desc, sizeof(m_Desc)); RtlZeroMemory(&m_Desc, sizeof(m_Desc));
m_Desc.SampleWidth = m_VideoWidth;
m_Desc.SampleHeight = m_VideoHeight; int alignment;
// HEVC using DXVA requires 128B alignment
if (m_VideoFormat & VIDEO_FORMAT_MASK_H265) {
alignment = 128;
}
else {
alignment = 16;
}
m_Desc.SampleWidth = FFALIGN(m_VideoWidth, alignment);
m_Desc.SampleHeight = FFALIGN(m_VideoHeight, alignment);
m_Desc.SampleFormat.VideoChromaSubsampling = DXVA2_VideoChromaSubsampling_Unknown; m_Desc.SampleFormat.VideoChromaSubsampling = DXVA2_VideoChromaSubsampling_Unknown;
m_Desc.SampleFormat.NominalRange = DXVA2_NominalRange_Unknown; m_Desc.SampleFormat.NominalRange = DXVA2_NominalRange_Unknown;
m_Desc.SampleFormat.VideoTransferMatrix = DXVA2_VideoTransferMatrix_Unknown; m_Desc.SampleFormat.VideoTransferMatrix = DXVA2_VideoTransferMatrix_Unknown;
@@ -588,16 +592,16 @@ void DXVA2Renderer::renderFrame(AVFrame* frame)
sample.Start = m_FrameIndex; sample.Start = m_FrameIndex;
sample.End = m_FrameIndex + 1; sample.End = m_FrameIndex + 1;
sample.SrcSurface = surface; sample.SrcSurface = surface;
sample.SrcRect.right = m_Desc.SampleWidth; sample.SrcRect.right = m_VideoWidth;
sample.SrcRect.bottom = m_Desc.SampleHeight; sample.SrcRect.bottom = m_VideoHeight;
sample.SampleFormat = m_Desc.SampleFormat; sample.SampleFormat = m_Desc.SampleFormat;
sample.PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); sample.PlanarAlpha = DXVA2_Fixed32OpaqueAlpha();
// Center in frame and preserve aspect ratio // Center in frame and preserve aspect ratio
SDL_Rect src, dst; SDL_Rect src, dst;
src.x = src.y = 0; src.x = src.y = 0;
src.w = m_Desc.SampleWidth; src.w = m_VideoWidth;
src.h = m_Desc.SampleHeight; src.h = m_VideoHeight;
dst.x = dst.y = 0; dst.x = dst.y = 0;
dst.w = m_DisplayWidth; dst.w = m_DisplayWidth;
dst.h = m_DisplayHeight; dst.h = m_DisplayHeight;