Maarten Lankhorst : quartz: No longer drop packets on discontinuities.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fb2c975a8f5b54f9e7a667ee3638f340d80f2af1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb2c975a8f5b54f9e7a667ee36...

Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com>
Date:   Fri Apr 18 16:13:25 2008 -0700

quartz: No longer drop packets on discontinuities.

---

 dlls/quartz/acmwrapper.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index 4d42980..8df37ef 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -118,11 +118,14 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
 	unprepare_header = TRUE;
 
         if (IMediaSample_IsDiscontinuity(pSample) == S_OK)
+        {
             res = acmStreamConvert(This->has, &ash, ACM_STREAMCONVERTF_START);
+            /* One sample could be converted to multiple packets */
+            IMediaSample_SetDiscontinuity(pSample, FALSE);
+        }
         else
             res = acmStreamConvert(This->has, &ash, 0);
 
-
         if (res)
         {
 	    if(res != MMSYSERR_MOREDATA)
@@ -162,10 +165,7 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte
         }
         TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000));
 
-        if (IMediaSample_IsDiscontinuity(pSample) == S_FALSE)
-            hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample);
-        else
-            TRACE("Skipping first sample: Discontinuity\n");
+        hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample);
 
         if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) {
             if (FAILED(hr))