Skip to content

W
wine-cw
Commit 4afc2ae9 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alexandre Julliard
Browse files
Options

Revert "quartz: Handle failures better in acmwrapper.".

This reverts commit 1ba8ece7. Code for holding sample doesn't make sense and shouldn't be there because it should really be handled by keeping track of the last successful position of a frame sent and aborting the whole processing as soon as rejection occurs.
parent edacd984
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 80 deletions
dlls/quartz/acmwrapper.c
View file @ 4afc2ae9
......@@ -48,9 +48,6 @@ typedef struct ACMWrapperImpl
LPWAVEFORMATEX pWfIn;
LPWAVEFORMATEX pWfOut;
IMediaSample *recv, *xmit;
ULONG done;
LONGLONG lasttime_real;
LONGLONG lasttime_sent;
} ACMWrapperImpl;
......@@ -69,61 +66,32 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
HRESULT hr;
LONGLONG tStart = -1, tStop = -1, tMed;
assert(pSample);
if (This->xmit)
{
hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], This->xmit);
if (hr != S_OK)
return hr;
IMediaSample_Release(This->xmit);
This->xmit = NULL;
}
hr = IMediaSample_GetPointer(pSample, &pbSrcStream);
if (FAILED(hr))
{
ERR("Cannot get pointer to sample data (%x)\n", hr);
return hr;
}
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
preroll = (IMediaSample_IsPreroll(pSample) == S_OK);
if (pSample != This->recv)
{
if (This->recv)
{
/* Get rid of buffered sample first */
hr = ACMWrapper_ProcessSampleData(pTransformFilter, This->recv);
if (hr != S_OK)
return hr;
if (This->recv)
return S_FALSE;
}
preroll = (IMediaSample_IsPreroll(pSample) == S_OK);
IMediaSample_GetTime(pSample, &tStart, &tStop);
IMediaSample_GetTime(pSample, &tStart, &tStop);
cbSrcStream = IMediaSample_GetActualDataLength(pSample);
/* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */
if (IMediaSample_IsDiscontinuity(pSample) == S_OK)
{
This->lasttime_real = tStart;
This->lasttime_sent = tStart;
}
else if (This->lasttime_real == tStart)
tStart = This->lasttime_sent;
else
WARN("Discontinuity\n");
}
else
/* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */
if (IMediaSample_IsDiscontinuity(pSample) == S_OK)
{
tStart = This->lasttime_sent;
tStop = This->lasttime_real;
cbSrcStream -= This->done;
pbSrcStream += This->done;
This->lasttime_real = tStart;
This->lasttime_sent = tStart;
}
else if (This->lasttime_real == tStart)
tStart = This->lasttime_sent;
else
WARN("Discontinuity\n");
tMed = tStart;
TRACE("Sample data ptr = %p, size = %u\n", pbSrcStream, cbSrcStream);
TRACE("Sample data ptr = %p, size = %ld\n", pbSrcStream, (long)cbSrcStream);
hr = IPin_ConnectionMediaType(This->tf.ppPins[0], &amt);
if (FAILED(hr)) {
......@@ -233,44 +201,17 @@ error:
ash.pbSrc += ash.cbSrcLengthUsed;
ash.cbSrcLength -= ash.cbSrcLengthUsed;
if (hr == S_FALSE)
{
This->xmit = pOutSample;
if (ash.cbSrcLength && !This->recv)
{
This->recv = pSample;
IMediaSample_AddRef(This->recv);
}
else if (This->recv)
{
IMediaSample_Release(This->recv);
This->recv = NULL;
}
This->done = IMediaSample_GetActualDataLength(pSample) - ash.cbSrcLength;
break;
}
if (pOutSample)
IMediaSample_Release(pOutSample);
pOutSample = NULL;
}
This->lasttime_real = tStop;
This->lasttime_sent = tMed;
if (hr != S_OK)
FIXME("FATALITY: %08x\n", hr);
else if (This->recv)
{
assert(This->recv == pSample);
IMediaSample_Release(This->recv);
This->recv = NULL;
}
if (hr == S_FALSE)
return S_OK;
return hr;
}
......@@ -336,13 +277,7 @@ static HRESULT ACMWrapper_Cleanup(TransformFilterImpl* pTransformFilter)
This->has = 0;
This->lasttime_real = This->lasttime_sent = -1;
if (This->recv)
IMediaSample_Release(This->recv);
if (This->xmit)
IMediaSample_Release(This->xmit);
This->recv = This->xmit = NULL;
return S_OK;
}
......@@ -378,7 +313,6 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv)
*ppv = (LPVOID)This;
This->lasttime_real = This->lasttime_sent = -1;
This->recv = This->xmit = NULL;
return hr;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment