November 2010 - Wine-commits

Maarten Lankhorst : strmbase: Forward IQualityControl on output pin to base filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 81763bf2ba6638de16f5fa2f4e57cc3f831102d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81763bf2ba6638de16f5fa2f4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:11 2010 +0100 strmbase: Forward IQualityControl on output pin to base filter. --- dlls/strmbase/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 1b0b48c..1731145 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -359,9 +359,10 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Maarten Lankhorst : quartz: Forward IQualityControl on pullpin to base filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 3329873b818bfbb2b70846b6f2aa34bd07f5b973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3329873b818bfbb2b70846b6f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 5 23:19:12 2010 +0100 quartz: Forward IQualityControl on pullpin to base filter. --- dlls/quartz/pin.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 118be2c..297b2d6 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -337,9 +337,10 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) + else if (IsEqualIID(riid, &IID_IMediaSeeking) || + IsEqualIID(riid, &IID_IQualityControl)) { - return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + return IBaseFilter_QueryInterface(This->pin.pinInfo.pFilter, riid, ppv); } if (*ppv)

1 0

Piotr Caban : mshtml: Impoved implementation of nsURI_GetAsciiHost.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 872ba8af29aeac72c0dbde2d26f70296b58639ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=872ba8af29aeac72c0dbde2d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 7 18:46:54 2010 +0100 mshtml: Impoved implementation of nsURI_GetAsciiHost. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 18526a5..578f1b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2101,8 +2101,8 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) if(This->nsuri) return nsIURI_GetAsciiHost(This->nsuri, aAsciiHost); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + FIXME("Use Uri_PUNYCODE_IDN_HOST flag\n"); + return get_uri_string(This, Uri_PROPERTY_HOST, aAsciiHost); } static nsresult NSAPI nsURI_GetOriginCharset(nsIURL *iface, nsACString *aOriginCharset)

1 0

Piotr Caban : shlwapi: Improved UrlCombineW implementation.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 5024a05780d0adef2eb141212b2a66a55b658943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5024a05780d0adef2eb141212… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 7 18:47:08 2010 +0100 shlwapi: Improved UrlCombineW implementation. --- dlls/shlwapi/tests/url.c | 3 +++ dlls/shlwapi/url.c | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 21e2f80..0a4dcb3 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -313,6 +313,9 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/tests/#example", "tests9", 0, S_OK, "http://www.winehq.org/tests/tests9"}, {"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."}, {"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"}, + {"http://www.winehq.org/test12", "#", 0, S_OK, "http://www.winehq.org/test12#"}, + {"http://www.winehq.org/test13#aaa", "#bbb", 0, S_OK, "http://www.winehq.org/test13#bbb"}, + {"http://www.winehq.org/test14#aaa/bbb#ccc", "#", 0, S_OK, "http://www.winehq.org/test14#"}, {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}, {"file:///C:\\dir\\file.txt#hash\\hash", "test.txt", 0, S_OK, "file:///C:/dir/file.txt#hash/test.txt"}, {"file:///C:\\dir\\file.html#hash\\hash", "test.html", 0, S_OK, "file:///C:/dir/test.html"}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index adfbb09..ae2f408 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -730,7 +730,9 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, const WCHAR htmW[] = {'.','h','t','m',0}; const int len_htmW = 4; - if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) { + if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) + manual_search = TRUE; + else if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) { work -= len_htmW; if (strncmpiW(work, htmW, len_htmW) == 0) manual_search = TRUE; @@ -750,15 +752,15 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, /* search backwards starting from the current position */ while (*work != '/' && work > base.pszSuffix + sizeloc) --work; - if (work > base.pszSuffix + sizeloc) - base.cchSuffix = work - base.pszSuffix + 1; + base.cchSuffix = work - base.pszSuffix + 1; }else { /* search backwards starting from the end of the string */ work = strrchrW((base.pszSuffix+sizeloc), '/'); if (work) { len = (DWORD)(work - base.pszSuffix + 1); base.cchSuffix = len; - } + }else + base.cchSuffix = sizeloc; } /* @@ -801,6 +803,15 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, process_case = 4; break; } + if (*mrelative == '#') { + if(!(work = strchrW(base.pszSuffix+base.cchSuffix, '#'))) + work = (LPWSTR)base.pszSuffix + strlenW(base.pszSuffix); + + memcpy(preliminary, base.pszProtocol, (work-base.pszProtocol)*sizeof(WCHAR)); + preliminary[work-base.pszProtocol] = '\0'; + process_case = 1; + break; + } process_case = (*base.pszSuffix == '/' || base.nScheme == URL_SCHEME_MK) ? 5 : 3; break; }

1 0

Maarten Lankhorst : quartz: Fix return value of GetMediaTime.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 8af5c1b729ea56bf1053ce35c9b792a62fea95cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af5c1b729ea56bf1053ce35c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:45 2010 +0100 quartz: Fix return value of GetMediaTime. --- dlls/quartz/memallocator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index c0be482..3e79a12 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -703,7 +703,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO *pStart = This->tMediaStart; *pEnd = This->tMediaEnd; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd)

1 0

Maarten Lankhorst : quartz: Forward media time in AVI Decoder.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 2906a6f8abb6894366a552b60ade2c341b3d5cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2906a6f8abb6894366a552b60… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:46 2010 +0100 quartz: Forward media time in AVI Decoder. --- dlls/quartz/avidec.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b2419ea..39fa861 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -138,6 +138,11 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) 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); + LeaveCriticalSection(&This->tf.filter.csFilter); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)This->tf.ppPins[1], pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED)

1 0

Maarten Lankhorst : quartz: Forward media time in ACM Wrapper.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: af33888b39d2b4ad830ed9e42c04bce5d6cb2d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af33888b39d2b4ad830ed9e42… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:47 2010 +0100 quartz: Forward media time in ACM Wrapper. --- dlls/quartz/acmwrapper.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 66ae6c6..dfd0529 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -67,6 +67,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam MMRESULT res; HRESULT hr; LONGLONG tStart = -1, tStop = -1, tMed; + LONGLONG mtStart = -1, mtStop = -1, mtMed; EnterCriticalSection(&This->tf.filter.csFilter); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); @@ -80,6 +81,8 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam preroll = (IMediaSample_IsPreroll(pSample) == S_OK); IMediaSample_GetTime(pSample, &tStart, &tStop); + if (IMediaSample_GetMediaTime(pSample, &mtStart, &mtStop) != S_OK) + mtStart = mtStop = -1; cbSrcStream = IMediaSample_GetActualDataLength(pSample); /* Prevent discontinuities when codecs 'absorb' data but not give anything back in return */ @@ -94,6 +97,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam WARN("Discontinuity\n"); tMed = tStart; + mtMed = mtStart; TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); @@ -192,6 +196,21 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam ERR("No valid timestamp found\n"); IMediaSample_SetTime(pOutSample, NULL, NULL); } + + if (mtStart < 0) { + IMediaSample_SetMediaTime(pOutSample, NULL, NULL); + } else if (ash.cbSrcLengthUsed == cbSrcStream) { + IMediaSample_SetMediaTime(pOutSample, &mtStart, &mtStop); + mtStart = mtMed = mtStop; + } else if (mtStop >= mtStart) { + mtMed = mtStop - mtStart; + mtMed = mtStart + mtMed * ash.cbSrcLengthUsed / cbSrcStream; + IMediaSample_SetMediaTime(pOutSample, &mtStart, &mtMed); + mtStart = mtMed; + } else { + IMediaSample_SetMediaTime(pOutSample, NULL, NULL); + } + TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); LeaveCriticalSection(&This->tf.filter.csFilter);

1 0

Maarten Lankhorst : quartz: Fix time on avi parser.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: dba95c2288ed813b4984c20ee269f8a5e94f1f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba95c2288ed813b4984c20ee… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:48 2010 +0100 quartz: Fix time on avi parser. --- dlls/quartz/avisplit.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index fadca7d..e539d64 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -291,7 +291,7 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, { Parser_OutputPin *pin = (Parser_OutputPin *)This->Parser.ppPins[1+streamnumber]; HRESULT hr; - LONGLONG start, stop; + LONGLONG start, stop, rtstart, rtstop; StreamData *stream = &This->streams[streamnumber]; start = pin->dwSamplesProcessed; @@ -314,7 +314,29 @@ static HRESULT AVISplitter_Receive(AVISplitterImpl *This, IMediaSample *sample, stop *= 10000000; stop /= stream->streamheader.dwRate; - IMediaSample_SetTime(sample, &start, &stop); + if (IMediaSample_IsDiscontinuity(sample) == S_OK) { + IPin *victim; + EnterCriticalSection(&This->Parser.filter.csFilter); + pin->pin.pin.tStart = start; + pin->pin.pin.dRate = This->Parser.sourceSeeking.dRate; + hr = IPin_ConnectedTo((IPin *)pin, &victim); + if (hr == S_OK) + { + hr = IPin_NewSegment(victim, start, This->Parser.sourceSeeking.llStop, + This->Parser.sourceSeeking.dRate); + if (hr != S_OK) + FIXME("NewSegment returns %08x\n", hr); + IPin_Release(victim); + } + LeaveCriticalSection(&This->Parser.filter.csFilter); + if (hr != S_OK) + return hr; + } + rtstart = (double)(start - pin->pin.pin.tStart) / pin->pin.pin.dRate; + rtstop = (double)(stop - pin->pin.pin.tStart) / pin->pin.pin.dRate; + hr = IMediaSample_SetMediaTime(sample, &start, &stop); + IMediaSample_SetTime(sample, &rtstart, &rtstop); + IMediaSample_SetMediaTime(sample, &start, &stop); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)&pin->pin, sample); @@ -426,6 +448,9 @@ static HRESULT AVISplitter_first_request(LPVOID iface) stream->pos_next = stream->pos; stream->index_next = stream->index; + /* This was sent after stopped->paused or stopped->playing, so set seek */ + stream->seek = 1; + /* There should be a packet queued from AVISplitter_next_request last time * It needs to be done now because this is the only way to ensure that every * stream will have at least 1 packet processed @@ -1285,7 +1310,6 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) { Parser_OutputPin *pin = (Parser_OutputPin *)This->Parser.ppPins[1+x]; StreamData *stream = This->streams + x; - IPin *victim = NULL; LONGLONG wanted_frames; DWORD last_keyframe = 0, last_keyframeidx = 0, preroll = 0; @@ -1294,13 +1318,6 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) wanted_frames /= 10000000; wanted_frames /= stream->streamheader.dwScale; - IPin_ConnectedTo((IPin *)pin, &victim); - if (victim) - { - IPin_NewSegment(victim, newpos, endpos, pPin->dRate); - IPin_Release(victim); - } - pin->dwSamplesProcessed = 0; stream->index = 0; stream->pos = 0;

1 0

Maarten Lankhorst : quartz: Fix time on MPEG splitter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 8c42595c34cbefef84f95a6671349410f3929d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c42595c34cbefef84f95a667… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:49 2010 +0100 quartz: Fix time on MPEG splitter. --- dlls/quartz/mpegsplit.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 8321131..c556b78 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -171,7 +171,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; LONGLONG length = 0; LONGLONG pos = BYTES_FROM_MEDIATIME(This->Parser.pInputPin->rtNext); - LONGLONG time = This->position; + LONGLONG time = This->position, rtstop, rtstart; HRESULT hr; BYTE *fbuf = NULL; DWORD len = IMediaSample_GetActualDataLength(pCurrentSample); @@ -229,7 +229,28 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, IMediaSample *pCurrentSample) TRACE("Media time : %u.%03u\n", (DWORD)(This->position/10000000), (DWORD)((This->position/10000)%1000)); - IMediaSample_SetTime(pCurrentSample, &time, &This->position); + if (IMediaSample_IsDiscontinuity(pCurrentSample) == S_OK) { + IPin *victim; + EnterCriticalSection(&This->Parser.filter.csFilter); + pOutputPin->pin.pin.tStart = time; + pOutputPin->pin.pin.dRate = This->Parser.sourceSeeking.dRate; + hr = IPin_ConnectedTo((IPin *)pOutputPin, &victim); + if (hr == S_OK) + { + hr = IPin_NewSegment(victim, time, This->Parser.sourceSeeking.llStop, + This->Parser.sourceSeeking.dRate); + if (hr != S_OK) + FIXME("NewSegment returns %08x\n", hr); + IPin_Release(victim); + } + LeaveCriticalSection(&This->Parser.filter.csFilter); + if (hr != S_OK) + return hr; + } + rtstart = (double)(time - pOutputPin->pin.pin.tStart) / pOutputPin->pin.pin.dRate; + rtstop = (double)(This->position - pOutputPin->pin.pin.tStart) / pOutputPin->pin.pin.dRate; + IMediaSample_SetTime(pCurrentSample, &rtstart, &rtstop); + IMediaSample_SetMediaTime(pCurrentSample, &time, &This->position); hr = BaseOutputPinImpl_Deliver((BaseOutputPin*)&pOutputPin->pin, pCurrentSample); @@ -672,7 +693,6 @@ static HRESULT WINAPI MPEGSplitter_seek(IMediaSeeking *iface) if (SUCCEEDED(hr)) { PullPin *pin = This->Parser.pInputPin; - IPin *victim = NULL; TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); @@ -682,12 +702,6 @@ static HRESULT WINAPI MPEGSplitter_seek(IMediaSeeking *iface) /* Make sure this is done while stopped, BeginFlush takes care of this */ EnterCriticalSection(&This->Parser.filter.csFilter); memcpy(This->header, header, 4); - IPin_ConnectedTo(This->Parser.ppPins[1], &victim); - if (victim) - { - IPin_NewSegment(victim, newpos, This->duration, pin->dRate); - IPin_Release(victim); - } pin->rtStart = pin->rtCurrent = MEDIATIME_FROM_BYTES(bytepos); pin->rtStop = MEDIATIME_FROM_BYTES((REFERENCE_TIME)This->EndOfFile); @@ -744,7 +758,7 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) pin->rtNext = rtSampleStop; IMediaSample_SetPreroll(sample, FALSE); - IMediaSample_SetDiscontinuity(sample, This->seek); + IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); This->seek = 0;

1 0

Maarten Lankhorst : winegstreamer: Forward media time on transform filter.
by Alexandre Julliard 08 Nov '10

08 Nov '10

Module: wine Branch: master Commit: 1577c5a8c38f5c94c8ca8bd7f1befbafaf3464bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1577c5a8c38f5c94c8ca8bd7f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 15:02:50 2010 +0100 winegstreamer: Forward media time on transform filter. --- dlls/winegstreamer/gsttffilter.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 9339299..f825a51 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -166,6 +166,14 @@ static GstFlowReturn got_data(GstPad *pad, GstBuffer *buf) { } else IMediaSample_SetTime(sample, NULL, NULL); + if (GST_BUFFER_OFFSET_IS_VALID(buf) && + GST_BUFFER_OFFSET_END_IS_VALID(buf)) { + tStart = buf->offset / 100; + tStop = buf->offset_end / 100; + IMediaSample_SetMediaTime(sample, &tStart, &tStop); + } + else + IMediaSample_SetMediaTime(sample, NULL, NULL); IMediaSample_SetDiscontinuity(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DISCONT)); IMediaSample_SetPreroll(sample, GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_PREROLL)); @@ -232,6 +240,10 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM if (hr == S_OK) buf->duration = (tStop - tStart)*100; } + if (IMediaSample_GetMediaTime(sample, &tStart, &tStop) == S_OK) { + buf->offset = tStart * 100; + buf->offset_end = tStop * 100; + } if (IMediaSample_IsDiscontinuity(sample) == S_OK) GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_DISCONT); if (IMediaSample_IsPreroll(sample) == S_OK)

1 0