Zebediah Figura : quartz/avidec: Don't copy the media time to the output sample.
Alexandre Julliard
julliard at winehq.org
Fri Nov 20 14:54:31 CST 2020
Module: wine
Branch: master
Commit: cd3b23c13ce98631432782942e633af441073e62
URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd3b23c13ce98631432782942e633af441073e62
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Nov 19 17:24:14 2020 -0600
quartz/avidec: Don't copy the media time to the output sample.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/avidec.c | 5 -----
dlls/quartz/tests/avidec.c | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c
index 4995276dbfc..77d2b5e2aa5 100644
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -204,11 +204,6 @@ static HRESULT WINAPI avi_decompressor_sink_Receive(struct strmbase_sink *iface,
else
IMediaSample_SetTime(pOutSample, NULL, NULL);
- if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK)
- IMediaSample_SetMediaTime(pOutSample, &tStart, &tStop);
- else
- IMediaSample_SetMediaTime(pOutSample, NULL, NULL);
-
hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample);
if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)
ERR("Error sending sample (%x)\n", hr);
diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c
index ac1e245c9e6..b9bca9b02ef 100644
--- a/dlls/quartz/tests/avidec.c
+++ b/dlls/quartz/tests/avidec.c
@@ -911,7 +911,7 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample
}
hr = IMediaSample_GetMediaTime(sample, &start, &stop);
- todo_wine ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr);
+ ok(hr == VFW_E_MEDIA_TIME_NOT_SET, "Got hr %#x.\n", hr);
hr = IMediaSample_IsDiscontinuity(sample);
todo_wine_if (testmode == 5) ok(hr == (testmode == 4) ? S_OK : S_FALSE, "Got hr %#x.\n", hr);
hr = IMediaSample_IsPreroll(sample);
More information about the wine-cvs
mailing list