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

Move DRM master state cleanup into cleanupRenderContext()

Browse Source
This commit is contained in:
Cameron Gutman
2026-04-06 19:24:04 -05:00
parent 9496c25271
commit 9c11dca454
2 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/ffmpeg-renderers/drm.cpp
+53 -43
View File
@@ -164,49 +164,8 @@ DrmRenderer::DrmRenderer(AVHWDeviceType hwDeviceType, IFFmpegRenderer *backendRe
DrmRenderer::~DrmRenderer() DrmRenderer::~DrmRenderer()
{ {
// If we have a composition surface, unmap it before disabling planes // DRM state should be restored by the time we get here
if (m_OverlayCompositionSurface) { SDL_assert(!m_DrmStateModified);
munmap(m_OverlayCompositionSurface->pixels, (uintptr_t)m_OverlayCompositionSurface->userdata);
SDL_FreeSurface(m_OverlayCompositionSurface);
}
if (m_DrmStateModified) {
// Ensure we're out of HDR mode
setHdrMode(false);
// Deactivate all planes
m_PropSetter.disablePlane(m_VideoPlane);
for (int i = 0; i < Overlay::OverlayMax; i++) {
m_PropSetter.disablePlane(m_OverlayPlanes[i]);
}
// Revert our changes from prepareToRender()
if (auto prop = m_Connector.property("content type")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto prop = m_Crtc.property("VRR_ENABLED")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto prop = m_Connector.property("max bpc")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto zpos = m_VideoPlane.property("zpos"); zpos && !zpos->isImmutable()) {
m_PropSetter.restorePropertyToInitial(*zpos);
}
for (int i = 0; i < Overlay::OverlayMax; i++) {
if (auto zpos = m_OverlayPlanes[i].property("zpos"); zpos && !zpos->isImmutable()) {
m_PropSetter.restorePropertyToInitial(*zpos);
}
}
for (auto &plane : m_UnusedActivePlanes) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Restoring previously active plane: %u",
plane.second.objectId());
m_PropSetter.restoreToInitial(plane.second);
}
m_PropSetter.apply();
}
for (int i = 0; i < k_SwFrameCount; i++) { for (int i = 0; i < k_SwFrameCount; i++) {
if (m_SwFrame[i].primeFd) { if (m_SwFrame[i].primeFd) {
@@ -420,6 +379,57 @@ void DrmRenderer::prepareToRender()
m_DrmStateModified = true; m_DrmStateModified = true;
} }
void DrmRenderer::cleanupRenderContext()
{
// This must only be called after prepareToRender()
SDL_assert(m_DrmStateModified);
// If we have a composition surface, unmap it before disabling planes
if (m_OverlayCompositionSurface) {
munmap(m_OverlayCompositionSurface->pixels, (uintptr_t)m_OverlayCompositionSurface->userdata);
SDL_FreeSurface(m_OverlayCompositionSurface);
m_OverlayCompositionSurface = nullptr;
}
// Ensure we're out of HDR mode
setHdrMode(false);
// Deactivate all planes
m_PropSetter.disablePlane(m_VideoPlane);
for (int i = 0; i < Overlay::OverlayMax; i++) {
m_PropSetter.disablePlane(m_OverlayPlanes[i]);
}
// Revert our changes from prepareToRender()
if (auto prop = m_Connector.property("content type")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto prop = m_Crtc.property("VRR_ENABLED")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto prop = m_Connector.property("max bpc")) {
m_PropSetter.restorePropertyToInitial(*prop);
}
if (auto zpos = m_VideoPlane.property("zpos"); zpos && !zpos->isImmutable()) {
m_PropSetter.restorePropertyToInitial(*zpos);
}
for (int i = 0; i < Overlay::OverlayMax; i++) {
if (auto zpos = m_OverlayPlanes[i].property("zpos"); zpos && !zpos->isImmutable()) {
m_PropSetter.restorePropertyToInitial(*zpos);
}
}
for (auto &plane : m_UnusedActivePlanes) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Restoring previously active plane: %u",
plane.second.objectId());
m_PropSetter.restoreToInitial(plane.second);
}
m_PropSetter.apply();
m_DrmStateModified = false;
}
bool DrmRenderer::initialize(PDECODER_PARAMETERS params) bool DrmRenderer::initialize(PDECODER_PARAMETERS params)
{ {
int i; int i;
app/streaming/video/ffmpeg-renderers/drm.h
+1
View File
@@ -704,6 +704,7 @@ public:
virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override; virtual bool prepareDecoderContext(AVCodecContext* context, AVDictionary** options) override;
virtual bool prepareDecoderContextInGetFormat(AVCodecContext*, AVPixelFormat) override; virtual bool prepareDecoderContextInGetFormat(AVCodecContext*, AVPixelFormat) override;
virtual void prepareToRender() override; virtual void prepareToRender() override;
virtual void cleanupRenderContext() override;
virtual void renderFrame(AVFrame* frame) override; virtual void renderFrame(AVFrame* frame) override;
virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) override; virtual enum AVPixelFormat getPreferredPixelFormat(int videoFormat) override;
virtual bool isPixelFormatSupported(int videoFormat, AVPixelFormat pixelFormat) override; virtual bool isPixelFormatSupported(int videoFormat, AVPixelFormat pixelFormat) override;