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

Pass DRM format modifiers to FB creation

Browse Source
This commit is contained in:
Cameron Gutman 2021-03-21 17:54:10 -05:00
parent 7758344a57
commit e87a5fa354
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/streaming/video/ffmpeg-renderers/drm.cpp
View File

@ -297,6 +297,8 @@ void DrmRenderer::renderFrame(AVFrame* frame)
uint32_t handles[4] = {}; uint32_t handles[4] = {};
uint32_t pitches[4] = {}; uint32_t pitches[4] = {};
uint32_t offsets[4] = {}; uint32_t offsets[4] = {};
uint64_t modifiers[4] = {};
uint32_t flags = 0;
SDL_Rect src, dst; SDL_Rect src, dst;
@ -318,12 +320,18 @@ void DrmRenderer::renderFrame(AVFrame* frame)
return; return;
} }
// Pass along the modifiers to DRM if there are some in the descriptor
if (drmFrame->objects[0].format_modifier != DRM_FORMAT_MOD_INVALID) {
flags |= DRM_MODE_FB_MODIFIERS;
}
SDL_assert(drmFrame->nb_layers == 1); SDL_assert(drmFrame->nb_layers == 1);
SDL_assert(drmFrame->layers[0].nb_planes == 2); SDL_assert(drmFrame->layers[0].nb_planes == 2);
for (int i = 0; i < drmFrame->layers[0].nb_planes; i++) { for (int i = 0; i < drmFrame->layers[0].nb_planes; i++) {
handles[i] = primeHandle; handles[i] = primeHandle;
pitches[i] = drmFrame->layers[0].planes[i].pitch; pitches[i] = drmFrame->layers[0].planes[i].pitch;
offsets[i] = drmFrame->layers[0].planes[i].offset; offsets[i] = drmFrame->layers[0].planes[i].offset;
modifiers[i] = drmFrame->objects[0].format_modifier;
} }
// Remember the last FB object we created so we can free it // Remember the last FB object we created so we can free it
@ -331,12 +339,13 @@ void DrmRenderer::renderFrame(AVFrame* frame)
uint32_t lastFbId = m_CurrentFbId; uint32_t lastFbId = m_CurrentFbId;
// Create a frame buffer object from the PRIME buffer // Create a frame buffer object from the PRIME buffer
err = drmModeAddFB2(m_DrmFd, frame->width, frame->height, err = drmModeAddFB2WithModifiers(m_DrmFd, frame->width, frame->height,
drmFrame->layers[0].format, drmFrame->layers[0].format,
handles, pitches, offsets, &m_CurrentFbId, 0); handles, pitches, offsets, modifiers,
&m_CurrentFbId, flags);
if (err < 0) { if (err < 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"drmModeAddFB2() failed: %d", "drmModeAddFB2WithModifiers() failed: %d",
errno); errno);
m_CurrentFbId = lastFbId; m_CurrentFbId = lastFbId;
return; return;