system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

quartz: Allow concurrent calls to AVI decoder qc_Notify and Receive.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56698
This commit is contained in:
Alfred Agrell 2024-05-29 17:33:29 +02:00 committed by Alexandre Julliard
parent 1543fc8d1b
commit c4a162a8fe
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/quartz/avidec.c
View file

@ -48,6 +48,8 @@ struct avi_decompressor
HIC hvid;
BITMAPINFOHEADER* pBihIn;
CRITICAL_SECTION late_cs;
REFERENCE_TIME late;
};
@ -77,7 +79,9 @@ static HRESULT avi_decompressor_sink_query_accept(struct strmbase_pin *iface, co
static HRESULT avi_decompressor_sink_end_flush(struct strmbase_sink *iface)
{
struct avi_decompressor *filter = impl_from_strmbase_filter(iface->pin.filter);
EnterCriticalSection(&filter->late_cs);
filter->late = -1;
LeaveCriticalSection(&filter->late_cs);
if (filter->source.pin.peer)
return IPin_EndFlush(filter->source.pin.peer);
return S_OK;
@ -167,8 +171,10 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
if (IMediaSample_IsSyncPoint(pSample) != S_OK)
flags |= ICDECOMPRESS_NOTKEYFRAME;
hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
EnterCriticalSection(&This->late_cs);
if (hr == S_OK && AVIDec_DropSample(This, tStart))
flags |= ICDECOMPRESS_HURRYUP;
LeaveCriticalSection(&This->late_cs);
res = ICDecompress(This->hvid, flags, This->pBihIn, pbSrcStream, &source_format->bmiHeader, pbDstStream);
if (res != ICERR_OK)
@ -482,12 +488,13 @@ static HRESULT WINAPI avi_decompressor_source_qc_Notify(IQualityControl *iface,
TRACE("filter %p, sender %p, type %#x, proportion %ld, late %s, timestamp %s.\n",
filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp));
EnterCriticalSection(&filter->filter.stream_cs);
/* can't take the stream CS here, Submarine Titans calls this function from a foreign thread while inside sink_Receive */
EnterCriticalSection(&filter->late_cs);
if (q.Late > 0)
filter->late = q.Late + q.TimeStamp;
else
filter->late = -1;
LeaveCriticalSection(&filter->filter.stream_cs);
LeaveCriticalSection(&filter->late_cs);
return S_OK;
}
@ -532,6 +539,9 @@ static void avi_decompressor_destroy(struct strmbase_filter *iface)
IPin_Disconnect(filter->source.pin.peer);
IPin_Disconnect(&filter->source.pin.IPin_iface);
filter->late_cs.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&filter->late_cs);
strmbase_sink_cleanup(&filter->sink);
strmbase_source_cleanup(&filter->source);
strmbase_passthrough_cleanup(&filter->passthrough);
@ -550,7 +560,9 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface)
if (!filter->source.pin.peer)
return S_OK;
EnterCriticalSection(&filter->late_cs);
filter->late = -1;
LeaveCriticalSection(&filter->late_cs);
source_format = (VIDEOINFOHEADER *)filter->source.pin.mt.pbFormat;
if ((res = ICDecompressBegin(filter->hvid, filter->pBihIn, &source_format->bmiHeader)))
@ -618,6 +630,9 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out)
ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE,
&object->sink.pin.IPin_iface);
InitializeCriticalSectionEx(&object->late_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
object->late_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": object.late_cs");
TRACE("Created AVI decompressor %p.\n", object);
*out = &object->filter.IUnknown_inner;