Zebediah Figura : quartz/videorenderer: Track the current sample locally.
Alexandre Julliard
julliard at winehq.org
Tue Feb 11 15:44:54 CST 2020
Module: wine
Branch: master
Commit: 5f9ce6870cea074c713325d8119a29f6d18581ae
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9ce6870cea074c713325d8119a29f6d18581ae
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Feb 10 19:22:19 2020 -0600
quartz/videorenderer: Track the current sample locally.
Only the video renderer uses it.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/videorenderer.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index b75f7bc4e7..4383f66e44 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -56,6 +56,7 @@ typedef struct VideoRendererImpl
DWORD saved_style;
HANDLE run_event;
+ IMediaSample *current_sample;
} VideoRendererImpl;
static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface)
@@ -177,9 +178,13 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa
{
const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event};
+ filter->current_sample = pSample;
+
LeaveCriticalSection(&filter->renderer.csRenderLock);
WaitForMultipleObjects(2, events, FALSE, INFINITE);
EnterCriticalSection(&filter->renderer.csRenderLock);
+
+ filter->current_sample = NULL;
}
return S_OK;
@@ -381,7 +386,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG
return VFW_E_NOT_PAUSED;
}
- if (!filter->renderer.pMediaSample)
+ if (!filter->current_sample)
{
LeaveCriticalSection(&filter->renderer.csRenderLock);
return E_UNEXPECTED;
@@ -394,7 +399,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG
}
memcpy(image, bih, sizeof(BITMAPINFOHEADER));
- IMediaSample_GetPointer(filter->renderer.pMediaSample, &sample_data);
+ IMediaSample_GetPointer(filter->current_sample, &sample_data);
memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size);
LeaveCriticalSection(&filter->renderer.csRenderLock);
More information about the wine-cvs
mailing list