jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix software upload for DRM renderer with non-720p resolutions

Browse source 
The buffer allocated for the 720p test frame was left around
and we would attempt to reuse it even if the stream had frames
of a different size.
This commit is contained in:
Cameron Gutman 2026-01-06 00:35:33 -06:00
commit 80ddd5ba13
2 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/streaming/video/ffmpeg-renderers/drm.cpp
View file

@ -1056,6 +1056,29 @@ bool DrmRenderer::mapSoftwareFrame(AVFrame *frame, AVDRMFrameDescriptor *mappedF
goto Exit; goto Exit;
} }
// If the frame size or format changed, we need to recreate the buffer
if (frame->width != drmFrame->width ||
frame->height != drmFrame->height ||
drmFormatTuple->second != drmFrame->format) {
if (drmFrame->primeFd) {
close(drmFrame->primeFd);
drmFrame->primeFd = 0;
}
if (drmFrame->mapping) {
munmap(drmFrame->mapping, drmFrame->size);
drmFrame->mapping = nullptr;
}
if (drmFrame->handle) {
struct drm_mode_destroy_dumb destroyBuf = {};
destroyBuf.handle = drmFrame->handle;
drmIoctl(m_DrmFd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroyBuf);
drmFrame->handle = 0;
}
}
// Create a new dumb buffer if needed // Create a new dumb buffer if needed
if (!drmFrame->handle) { if (!drmFrame->handle) {
struct drm_mode_create_dumb createBuf = {}; struct drm_mode_create_dumb createBuf = {};
@ -1081,6 +1104,9 @@ bool DrmRenderer::mapSoftwareFrame(AVFrame *frame, AVDRMFrameDescriptor *mappedF
goto Exit; goto Exit;
} }
drmFrame->width = frame->width;
drmFrame->height = frame->height;
drmFrame->format = drmFormatTuple->second;
drmFrame->handle = createBuf.handle; drmFrame->handle = createBuf.handle;
drmFrame->pitch = createBuf.pitch; drmFrame->pitch = createBuf.pitch;
drmFrame->size = createBuf.size; drmFrame->size = createBuf.size;
@ -1145,7 +1171,7 @@ bool DrmRenderer::mapSoftwareFrame(AVFrame *frame, AVDRMFrameDescriptor *mappedF
mappedFrame->nb_layers = 1; mappedFrame->nb_layers = 1;
auto &layer = mappedFrame->layers[0]; auto &layer = mappedFrame->layers[0];
layer.format = drmFormatTuple->second; layer.format = drmFrame->format;
int lastPlaneSize = 0; int lastPlaneSize = 0;
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {

4
app/streaming/video/ffmpeg-renderers/drm.h
View file

@ -682,6 +682,10 @@ private:
SwFrameMapper m_SwFrameMapper; SwFrameMapper m_SwFrameMapper;
int m_CurrentSwFrameIdx; int m_CurrentSwFrameIdx;
struct { struct {
int width;
int height;
uint32_t format;
uint32_t handle; uint32_t handle;
uint32_t pitch; uint32_t pitch;
uint64_t size; uint64_t size;