moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 15:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't render the alignment padding area

Browse Source
This commit is contained in:
Cameron Gutman 2022-02-05 15:21:42 -06:00
parent 04a0aca221
commit 4dc07bf63f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/streaming/video/ffmpeg-renderers/d3d11va.cpp
View File

@ -355,6 +355,9 @@ bool D3D11VARenderer::initialize(PDECODER_PARAMETERS params)
return false; return false;
} }
// Surfaces must be 128 pixel aligned for HEVC and 16 pixel aligned for H.264
m_TextureAlignment = (params->videoFormat & VIDEO_FORMAT_MASK_H265) ? 128 : 16;
if (!setupRenderingResources()) { if (!setupRenderingResources()) {
return false; return false;
} }
@ -403,9 +406,8 @@ bool D3D11VARenderer::initialize(PDECODER_PARAMETERS params)
framesContext->sw_format = params->videoFormat == VIDEO_FORMAT_H265_MAIN10 ? framesContext->sw_format = params->videoFormat == VIDEO_FORMAT_H265_MAIN10 ?
AV_PIX_FMT_P010 : AV_PIX_FMT_NV12; AV_PIX_FMT_P010 : AV_PIX_FMT_NV12;
// Surfaces must be 128 pixel aligned for HEVC and 16 pixel aligned for H.264 framesContext->width = FFALIGN(params->width, m_TextureAlignment);
framesContext->width = FFALIGN(params->width, (params->videoFormat & VIDEO_FORMAT_MASK_H265) ? 128 : 16); framesContext->height = FFALIGN(params->height, m_TextureAlignment);
framesContext->height = FFALIGN(params->height, (params->videoFormat & VIDEO_FORMAT_MASK_H265) ? 128 : 16);
// We can have up to 16 reference frames plus a working surface // We can have up to 16 reference frames plus a working surface
framesContext->initial_pool_size = DECODER_BUFFER_POOL_SIZE; framesContext->initial_pool_size = DECODER_BUFFER_POOL_SIZE;
@ -1235,12 +1237,18 @@ bool D3D11VARenderer::setupRenderingResources()
// Create our fixed vertex buffer for video rendering // Create our fixed vertex buffer for video rendering
{ {
SDL_assert(m_TextureAlignment != 0);
// Don't sample from the alignment padding area since that's not part of the video
float uMax = (float)m_DecoderParams.width / FFALIGN(m_DecoderParams.width, m_TextureAlignment);
float vMax = (float)m_DecoderParams.height / FFALIGN(m_DecoderParams.height, m_TextureAlignment);
VERTEX verts[] = VERTEX verts[] =
{ {
{-1, -1, 0, 1}, {-1, -1, 0, vMax},
{-1, 1, 0, 0}, {-1, 1, 0, 0},
{ 1, -1, 1, 1}, { 1, -1, uMax, vMax},
{ 1, 1, 1, 0}, { 1, 1, uMax, 0},
}; };
D3D11_BUFFER_DESC vbDesc = {}; D3D11_BUFFER_DESC vbDesc = {};

1
app/streaming/video/ffmpeg-renderers/d3d11va.h
View File

@ -42,6 +42,7 @@ private:
SDL_mutex* m_ContextLock; SDL_mutex* m_ContextLock;
DECODER_PARAMETERS m_DecoderParams; DECODER_PARAMETERS m_DecoderParams;
int m_TextureAlignment;
int m_DisplayWidth; int m_DisplayWidth;
int m_DisplayHeight; int m_DisplayHeight;
bool m_Windowed; bool m_Windowed;