moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-04-10 17:56:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Destroy subpictures before the associated image

Browse Source
This commit is contained in:
Cameron Gutman
2022-05-20 21:46:40 -05:00
parent f5f23a7c22
commit 95c4a24d99
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,12 +41,12 @@ VAAPIRenderer::~VAAPIRenderer()
VADisplay display = vaDeviceContext->display;
for (int i = 0; i < Overlay::OverlayMax; i++) {
if (m_OverlayImage[i].image_id != 0) {
vaDestroyImage(display, m_OverlayImage[i].image_id);
}
if (m_OverlaySubpicture[i] != 0) {
vaDestroySubpicture(display, m_OverlaySubpicture[i]);
}
if (m_OverlayImage[i].image_id != 0) {
vaDestroyImage(display, m_OverlayImage[i].image_id);
}
}
av_buffer_unref(&m_HwContext);
@@ -483,6 +483,14 @@ void VAAPIRenderer::notifyOverlayUpdated(Overlay::OverlayType type)
m_OverlaySubpicture[type] = 0;
SDL_UnlockMutex(m_OverlayMutex);
if (oldSubpictureId != 0) {
status = vaDestroySubpicture(vaDeviceContext->display, oldSubpictureId);
if (status != VA_STATUS_SUCCESS) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"vaDestroySubpicture() failed: %d",
status);
}
}
if (oldImageId != 0) {
status = vaDestroyImage(vaDeviceContext->display, oldImageId);
if (status != VA_STATUS_SUCCESS) {
@@ -490,12 +498,6 @@ void VAAPIRenderer::notifyOverlayUpdated(Overlay::OverlayType type)
"vaDestroyImage() failed: %d",
status);
}
status = vaDestroySubpicture(vaDeviceContext->display, oldSubpictureId);
if (status != VA_STATUS_SUCCESS) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"vaDestroySubpicture() failed: %d",
status);
}
}
if (!Session::get()->getOverlayManager().isOverlayEnabled(type)) {