November 2010 - Wine-Commits

Michael Stefaniuc : include: Avoid a multi-character character constant.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: b6b7069f2f6571883c13480d0851ee743cb8b457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b7069f2f6571883c13480d0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:18:28 2010 +0100 include: Avoid a multi-character character constant. Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard (sparse). --- include/devicetopology.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 4dc182b..18bfa50 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -35,7 +35,7 @@ cpp_quote("#ifndef E_NOTFOUND") cpp_quote("#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)") cpp_quote("#endif") -cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 'draH'") +cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 0x64726148 /* 'draH' */") cpp_quote("DEFINE_GUID(EVENTCONTEXT_VOLUMESLIDER, 0xe2c2e9de, 0x09b1, 0x4b04,0x84,0xe5, 0x07, 0x93, 0x12, 0x25, 0xee, 0x04);") cpp_quote("#define _IKsControl_")

1 0

Michael Stefaniuc : kernel32/tests: '\' needs to be escaped in a C string ( sparse).
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: bb442a2a576fc8026dca8cbb5f460ee25262923b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb442a2a576fc8026dca8cbb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:19:48 2010 +0100 kernel32/tests: '\' needs to be escaped in a C string (sparse). --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 55d62aa..1ccafb7 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -362,7 +362,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) for(unique=0;unique<3;unique++) { /* Nonexistent path */ - sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); + sprintf(invalid_dir, "%s\\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/,

1 0

Maarten Lankhorst : quartz: Use quality control in video renderer.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 7fbc8814d8e68de39be1fc0d748b68f3ffcc4672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbc8814d8e68de39be1fc0d7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:50 2010 +0100 quartz: Use quality control in video renderer. --- dlls/quartz/videorenderer.c | 82 ++++++++++++------------------------------- 1 files changed, 23 insertions(+), 59 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 2ad75c4..bf0fa7b 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -91,7 +91,6 @@ typedef struct VideoRendererImpl IUnknown * pUnkOuter; BOOL bUnkOuterValid; BOOL bAggregatable; - REFERENCE_TIME rtLastStop; LONG WindowStyle; /* During pause we can hold a single sample, for use in GetCurrentImage */ @@ -383,27 +382,8 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); - if (FAILED(hr)) - ERR("Cannot get sample time (%x)\n", hr); - - if (This->rtLastStop != tStart && This->filter.state == State_Running) - { - LONG64 delta; - delta = tStart - This->rtLastStop; - if ((delta < -100000 || delta > 100000) && - IMediaSample_IsDiscontinuity(pSample) == S_FALSE) - ERR("Unexpected discontinuity: Last: %u.%03u, tStart: %u.%03u\n", - (DWORD)(This->rtLastStop / 10000000), - (DWORD)((This->rtLastStop / 10000)%1000), - (DWORD)(tStart / 10000000), (DWORD)((tStart / 10000)%1000)); - This->rtLastStop = tStart; - } - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - { - This->rtLastStop = tStop; + if (IMediaSample_IsPreroll(pSample) == S_OK) { LeaveCriticalSection(&This->filter.csFilter); return S_OK; } @@ -436,6 +416,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS SetEvent(This->hEvent); if (This->filter.state == State_Paused) { + VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); This->sample_held = pSample; LeaveCriticalSection(&This->filter.csFilter); WaitForSingleObject(This->blocked, INFINITE); @@ -452,44 +433,15 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS LeaveCriticalSection(&This->filter.csFilter); return VFW_E_WRONG_STATE; } - } - - if (This->filter.pClock && This->filter.state == State_Running) - { - REFERENCE_TIME time, trefstart, trefstop; - LONG delta; - - /* Perhaps I <SHOULD> use the reference clock AdviseTime function here - * I'm not going to! When I tried, it seemed to generate lag and - * it caused instability. - */ - IReferenceClock_GetTime(This->filter.pClock, &time); - - trefstart = This->filter.rtStreamStart; - trefstop = (REFERENCE_TIME)((double)(tStop - tStart) / This->pInputPin->pin.dRate) + This->filter.rtStreamStart; - delta = (LONG)((trefstart-time)/10000); - This->filter.rtStreamStart = trefstop; - This->rtLastStop = tStop; - - if (delta > 0) - { - TRACE("Sleeping for %u ms\n", delta); - Sleep(delta); - } - else if (time > trefstop) - { - TRACE("Dropping sample: Time: %u.%03u ms trefstop: %u.%03u ms!\n", - (DWORD)(time / 10000000), (DWORD)((time / 10000)%1000), - (DWORD)(trefstop / 10000000), (DWORD)((trefstop / 10000)%1000) ); - This->rtLastStop = tStop; - LeaveCriticalSection(&This->filter.csFilter); - return S_OK; + } else { + hr = QualityControlRender_WaitFor(&This->qcimpl, pSample, This->blocked); + if (hr == S_OK) { + QualityControlRender_BeginRender(&This->qcimpl); + VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); + QualityControlRender_EndRender(&This->qcimpl); } + QualityControlRender_DoQOS(&This->qcimpl); } - This->rtLastStop = tStop; - - VideoRenderer_SendSampleData(This, pbSrcStream, cbSrcStream); - LeaveCriticalSection(&This->filter.csFilter); return S_OK; } @@ -601,7 +553,6 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pVideoRenderer->init = 0; pVideoRenderer->AutoShow = 1; - pVideoRenderer->rtLastStop = -1; ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT)); ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT)); @@ -846,6 +797,17 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) return S_OK; } +static HRESULT WINAPI VideoRenderer_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) { + VideoRendererImpl *This = (VideoRendererImpl *)iface; + HRESULT hr; + + EnterCriticalSection(&This->filter.csFilter); + QualityControlRender_SetClock(&This->qcimpl, clock); + hr = BaseFilterImpl_SetSyncSource(iface, clock); + LeaveCriticalSection(&This->filter.csFilter); + return hr; +} + static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr = S_OK; @@ -867,6 +829,7 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta This->filter.rtStreamStart = tStart; This->filter.state = State_Running; + QualityControlRender_Start(&This->qcimpl, tStart); } else if (This->filter.filterInfo.pGraph) { IMediaEventSink *pEventSink; hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); @@ -925,7 +888,7 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = VideoRenderer_Pause, VideoRenderer_Run, VideoRenderer_GetState, - BaseFilterImpl_SetSyncSource, + VideoRenderer_SetSyncSource, BaseFilterImpl_GetSyncSource, BaseFilterImpl_EnumPins, VideoRenderer_FindPin, @@ -984,6 +947,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) if (pVideoRenderer->filter.state == State_Paused) ResetEvent(pVideoRenderer->blocked); + QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface); LeaveCriticalSection(This->pin.pCritSec); MediaSeekingPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk);

1 0

Maarten Lankhorst : quartz: Rework direct sound renderer rework to be more time aware.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 79f16188289eb84732313e36c0d88db234596f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f16188289eb84732313e36c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:51 2010 +0100 quartz: Rework direct sound renderer rework to be more time aware. --- dlls/quartz/dsoundrender.c | 380 ++++++++++++++++++++++---------------------- 1 files changed, 188 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79f16188289eb84732313…

1 0

Maarten Lankhorst : strmbase: Add support for rendering algorithms to quality control.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 95897b6819ca7d0f2a7d687746990e186640b4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95897b6819ca7d0f2a7d68774… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:49 2010 +0100 strmbase: Add support for rendering algorithms to quality control. --- dlls/strmbase/qualitycontrol.c | 236 +++++++++++++++++++++++++++++++++++++++- include/wine/strmbase.h | 15 +++ 2 files changed, 250 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95897b6819ca7d0f2a7d6…

1 0

Maarten Lankhorst : winegstreamer: Add support for qos to demuxer.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 46f4011ec4d3f7882b053244be133e271d59015d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f4011ec4d3f7882b053244b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:48 2010 +0100 winegstreamer: Add support for qos to demuxer. --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c1d485d..1c4b796 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -80,6 +80,7 @@ struct GSTOutPin { AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; + QualityControlImpl qcimpl; SourceSeeking seek; }; @@ -88,6 +89,7 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IPinVtbl GST_OutputPin_Vtbl; static const IPinVtbl GST_InputPin_Vtbl; static const IBaseFilterVtbl GST_Vtbl; +static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt); static HRESULT GST_RemoveOutputPins(GSTImpl *This); @@ -1282,6 +1284,21 @@ static const IMediaSeekingVtbl GST_Seeking_Vtbl = SourceSeekingImpl_GetPreroll }; +static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { + QualityControlImpl *This = (QualityControlImpl*)iface; + GSTOutPin *pin = (GSTOutPin*)This->self; + gst_pad_push_event(pin->my_sink, gst_event_new_qos(1000./qm.Proportion, qm.Late*100, qm.TimeStamp*100)); + return S_OK; +} + +static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl = { + QualityControlImpl_QueryInterface, + QualityControlImpl_AddRef, + QualityControlImpl_Release, + GST_QualityControl_Notify, + QualityControlImpl_SetSink +}; + static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) { GSTOutPin *This = (GSTOutPin *)iface; @@ -1295,6 +1312,8 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) *ppv = &This->seek; + else if (IsEqualIID(riid, &IID_IQualityControl)) + *ppv = &This->qcimpl; if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1422,6 +1441,8 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI pin->caps_event = CreateEventW(NULL, 0, 0, NULL); pin->segment = gst_segment_new(); This->cStreams++; + QualityControlImpl_init(&pin->qcimpl, NULL, (IBaseFilter*)pin); + pin->qcimpl.lpVtbl = &GSTOutPin_QualityControl_Vtbl; SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); } else

1 0

Maarten Lankhorst : quartz: Add quality control to avi decoder.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: f38688b836497c3eca7fbdebe30d69261b19dfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f38688b836497c3eca7fbdebe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:42 2010 +0100 quartz: Add quality control to avi decoder. --- dlls/quartz/avidec.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 39fa861..02f7674 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -48,6 +48,7 @@ typedef struct AVIDecImpl HIC hvid; BITMAPINFOHEADER* pBihIn; BITMAPINFOHEADER* pBihOut; + REFERENCE_TIME late; } AVIDecImpl; static const IBaseFilterVtbl AVIDec_Vtbl; @@ -58,6 +59,7 @@ static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) DWORD result; TRACE("(%p)->()\n", This); + This->late = -1; result = ICDecompressBegin(This->hvid, This->pBihIn, This->pBihOut); if (result != ICERR_OK) @@ -68,6 +70,36 @@ static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter) return S_OK; } +static HRESULT WINAPI AVIDec_EndFlush(TransformFilter *pTransformFilter) { + AVIDecImpl* This = (AVIDecImpl*)pTransformFilter; + This->late = -1; + return S_OK; +} + +static HRESULT WINAPI AVIDec_NotifyDrop(TransformFilter *pTransformFilter, IBaseFilter *sender, Quality qm) { + AVIDecImpl *This = (AVIDecImpl*)pTransformFilter; + + EnterCriticalSection(&This->tf.filter.csFilter); + if (qm.Late > 0) + This->late = qm.Late + qm.TimeStamp; + else + This->late = -1; + LeaveCriticalSection(&This->tf.filter.csFilter); + return S_OK; +} + +static int AVIDec_DropSample(AVIDecImpl *This, REFERENCE_TIME tStart) { + if (This->late < 0) + return 0; + + if (tStart < This->late) { + TRACE("Dropping sample\n"); + return 1; + } + This->late = -1; + return 0; +} + static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) { AVIDecImpl* This = (AVIDecImpl *)tf; @@ -80,6 +112,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) DWORD cbSrcStream; LPBYTE pbSrcStream; LONGLONG tStart, tStop; + DWORD flags = 0; EnterCriticalSection(&This->tf.filter.csFilter); hr = IMediaSample_GetPointer(pSample, &pbSrcStream); @@ -123,10 +156,22 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) goto error; } - res = ICDecompress(This->hvid, 0, This->pBihIn, pbSrcStream, This->pBihOut, pbDstStream); + if (IMediaSample_IsPreroll(pSample) == S_OK) + flags |= ICDECOMPRESS_PREROLL; + if (IMediaSample_IsSyncPoint(pSample) != S_OK) + flags |= ICDECOMPRESS_NOTKEYFRAME; + if (IMediaSample_GetTime(pSample, &tStart, NULL) == S_OK && + AVIDec_DropSample(This, tStart)) + flags |= ICDECOMPRESS_HURRYUP; + + res = ICDecompress(This->hvid, flags, This->pBihIn, pbSrcStream, This->pBihOut, pbDstStream); if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); + /* Drop sample if its intended to be dropped */ + if (flags & ICDECOMPRESS_HURRYUP) + goto error; + IMediaSample_SetActualDataLength(pOutSample, This->pBihOut->biSizeImage); IMediaSample_SetPreroll(pOutSample, (IMediaSample_IsPreroll(pSample) == S_OK)); @@ -338,8 +383,9 @@ static const TransformFilterFuncTable AVIDec_FuncsTable = { AVIDec_BreakConnect, NULL, NULL, + AVIDec_EndFlush, NULL, - NULL + AVIDec_NotifyDrop }; HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv)

1 0

Maarten Lankhorst : quartz: Reset stream time when paused after seeking.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 10c51a80f03bd541dc391e41355ee13307d40580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c51a80f03bd541dc391e413… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:43 2010 +0100 quartz: Reset stream time when paused after seeking. --- dlls/quartz/filtergraph.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f8d2ff2..eeafe32 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1937,8 +1937,10 @@ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { IReferenceClock_GetTime(This->refClock, &now); if (This->state == State_Stopped) This->start_time = now + 500000; - else + else if (This->pause_time >= 0) This->start_time += now - This->pause_time; + else + This->start_time = now; } else This->start_time = 0; @@ -1957,8 +1959,10 @@ static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { if (This->state == State_Paused) goto out; - if (This->state == State_Running && This->refClock) + if (This->state == State_Running && This->refClock && This->start_time >= 0) IReferenceClock_GetTime(This->refClock, &This->pause_time); + else + This->pause_time = -1; SendFilterMessage(iface, SendPause, 0); This->state = State_Paused; @@ -2433,10 +2437,10 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, args.stopflags = dwStopFlags; hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); - if (This->refClock && ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning)) - { - /* Update start time, prevents weird jumps */ - IReferenceClock_GetTime(This->refClock, &This->start_time); + if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) { + if (This->state == State_Running) + FIXME("Seeking while graph is running is not properly supported!\n"); + This->pause_time = This->start_time = -1; } LeaveCriticalSection(&This->cs);

1 0

Maarten Lankhorst : winegstreamer: Move seeking from filter to pins.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: d82d3d074b3cc2424c342dde2d60f5f4ab30e5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82d3d074b3cc2424c342dde2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:47 2010 +0100 winegstreamer: Move seeking from filter to pins. --- dlls/winegstreamer/gstdemux.c | 79 ++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 51 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a6f72c4..c1d485d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,6 @@ typedef struct GSTImpl { GSTInPin pInputPin; GSTOutPin **ppPins; LONG cStreams; - SourceSeeking sourceSeeking; LONGLONG filesize; @@ -81,6 +80,7 @@ struct GSTOutPin { AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; + SourceSeeking seek; }; static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -544,6 +544,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, buf->timestamp + buf->duration); if (rtStop >= 0) rtStop /= 100; + TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); IMediaSample_SetTime(sample, &rtStart, rtStop >= 0 ? &rtStop : NULL); IMediaSample_SetMediaTime(sample, &tStart, &tStop); } else { @@ -876,7 +877,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; HRESULT hr; int ret, i; - LONGLONG avail; + LONGLONG avail, duration; GstFormat format = GST_FORMAT_TIME; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( "quartz_src", @@ -931,28 +932,24 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI FIXME("Gstreamer could not find any streams\n"); hr = E_FAIL; } else { - for (i = 0; i < This->cStreams; ++i) + gst_pad_query_duration(This->ppPins[0]->their_src, &format, &duration); + for (i = 0; i < This->cStreams; ++i) { + This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; WaitForSingleObject(This->ppPins[i]->caps_event, -1); + } hr = S_OK; } *props = This->props; - gst_pad_query_duration(This->ppPins[0]->their_src, &format, &This->sourceSeeking.llDuration); - This->sourceSeeking.llDuration /= 100; gst_element_set_state(This->gstfilter, GST_STATE_READY); gst_element_get_state(This->gstfilter, NULL, NULL, -1); This->initial = 0; This->nextofs = This->nextpullofs = 0; - - GST_ChangeCurrent((IMediaSeeking*)&This->sourceSeeking); - - This->sourceSeeking.llCurrent = 0; - This->sourceSeeking.llStop = This->sourceSeeking.llDuration; return hr; } -static inline GSTImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (GSTImpl *)((char*)iface - FIELD_OFFSET(GSTImpl, sourceSeeking.lpVtbl)); +static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) { + return (GSTOutPin *)((char*)iface - FIELD_OFFSET(GSTOutPin, seek.lpVtbl)); } static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) @@ -1011,8 +1008,6 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { This->push_thread = NULL; This->event = CreateEventW(NULL, 0, 0, NULL); - SourceSeeking_Init(&This->sourceSeeking, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); - piInput = &This->pInputPin.pin.pinInfo; piInput->dir = PINDIR_INPUT; piInput->pFilter = (IBaseFilter *)This; @@ -1067,15 +1062,14 @@ static HRESULT WINAPI GST_QueryInterface(IBaseFilter *iface, REFIID riid, LPVOID *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking; if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow) && + !IsEqualIID(riid, &IID_IAMFilterMiscFlags)) FIXME("No interface for %s!\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -1226,59 +1220,41 @@ static const IBaseFilterVtbl GST_Vtbl = { }; static HRESULT WINAPI GST_ChangeCurrent(IMediaSeeking *iface) { - GSTImpl *This = impl_from_IMediaSeeking(iface); - int i; - GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, This->sourceSeeking.llCurrent * 100, GST_SEEK_TYPE_NONE, -1); - FIXME("(%p) filter hasn't implemented current position change, going to %i.%i!\n", iface, (int)(This->sourceSeeking.llCurrent / 10000000), (int)((This->sourceSeeking.llCurrent / 10000)%1000)); - for (i = 0; i < This->cStreams; ++i) { - GstPad *pad = This->ppPins[i]->my_sink; - gst_event_ref(ev); - gst_pad_push_event(pad, ev); - } - gst_event_unref(ev); + GSTOutPin *This = impl_from_IMediaSeeking(iface); + GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, This->seek.llCurrent * 100, GST_SEEK_TYPE_NONE, -1); + TRACE("(%p) going to %i.%i!\n", iface, (int)(This->seek.llCurrent / 10000000), (int)((This->seek.llCurrent / 10000)%1000)); + gst_pad_push_event(This->my_sink, ev); return S_OK; } static HRESULT WINAPI GST_ChangeStop(IMediaSeeking *iface) { - GSTImpl *This = impl_from_IMediaSeeking(iface); - int i; - GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_SET, This->sourceSeeking.llStop * 100); - FIXME("(%p) filter hasn't implemented stop position change, going to %i.%i!\n", iface, (int)(This->sourceSeeking.llStop / 10000000), (int)((This->sourceSeeking.llStop / 10000)%1000)); - for (i = 0; i < This->cStreams; ++i) { - GstPad *pad = This->ppPins[i]->my_sink; - gst_event_ref(ev); - gst_pad_push_event(pad, ev); - } - gst_event_unref(ev); + GSTOutPin *This = impl_from_IMediaSeeking(iface); + GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_SET, This->seek.llStop); + TRACE("(%p) going to %i.%i!\n", iface, (int)(This->seek.llCurrent / 10000000), (int)((This->seek.llCurrent / 10000)%1000)); + gst_pad_push_event(This->my_sink, ev); return S_OK; } static HRESULT WINAPI GST_ChangeRate(IMediaSeeking *iface) { - GSTImpl *This = impl_from_IMediaSeeking(iface); - int i; - GstEvent *ev = gst_event_new_seek(This->sourceSeeking.dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); - FIXME("(%p) filter hasn't implemented rate change! Going to %g\n", iface, This->sourceSeeking.dRate); - for (i = 0; i < This->cStreams; ++i) { - GstPad *pad = This->ppPins[i]->my_sink; - gst_event_ref(ev); - gst_pad_push_event(pad, ev); - } - gst_event_unref(ev); + GSTOutPin *This = impl_from_IMediaSeeking(iface); + GstEvent *ev = gst_event_new_seek(This->seek.dRate, GST_FORMAT_TIME, 0, GST_SEEK_TYPE_NONE, -1, GST_SEEK_TYPE_NONE, -1); + TRACE("(%p) New rate %g\n", iface, This->seek.dRate); + gst_pad_push_event(This->my_sink, ev); return S_OK; } static HRESULT WINAPI GST_Seeking_QueryInterface(IMediaSeeking *iface, REFIID riid, void **ppv) { - GSTImpl *This = impl_from_IMediaSeeking(iface); + GSTOutPin *This = impl_from_IMediaSeeking(iface); return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); } static ULONG WINAPI GST_Seeking_AddRef(IMediaSeeking *iface) { - GSTImpl *This = impl_from_IMediaSeeking(iface); + GSTOutPin *This = impl_from_IMediaSeeking(iface); return IUnknown_AddRef((IUnknown *)This); } static ULONG WINAPI GST_Seeking_Release(IMediaSeeking *iface) { - GSTImpl *This = impl_from_IMediaSeeking(iface); + GSTOutPin *This = impl_from_IMediaSeeking(iface); return IUnknown_Release((IUnknown *)This); } @@ -1318,7 +1294,7 @@ static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void ** else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); + *ppv = &This->seek; if (*ppv) { IUnknown_AddRef((IUnknown *)(*ppv)); @@ -1446,6 +1422,7 @@ static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDI pin->caps_event = CreateEventW(NULL, 0, 0, NULL); pin->segment = gst_segment_new(); This->cStreams++; + SourceSeeking_Init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate, &This->filter.csFilter); BaseFilterImpl_IncrementPinVersion((BaseFilter*)This); } else ERR("Failed with error %x\n", hr);

1 0

Maarten Lankhorst : winegstreamer: Fix NewSegment in transform filter.
by Alexandre Julliard Nov. 10, 2010

Nov. 10, 2010

Module: wine Branch: master Commit: 1b192ae79952d7ef28b7ba0ca06d4d19e821647f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b192ae79952d7ef28b7ba0ca… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:45 2010 +0100 winegstreamer: Fix NewSegment in transform filter. --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index f825a51..e84ade7 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -429,7 +429,7 @@ static HRESULT WINAPI Gstreamer_transform_NewSegment(TransformFilter *iface, REF TRACE("%p\n", This); gst_pad_push_event(This->my_src, gst_event_new_new_segment_full(1, - 1.0, dRate, GST_FORMAT_TIME, tStart*100, tStop <= tStart ? -1 : tStop * 100, tStart*100)); + 1.0, dRate, GST_FORMAT_TIME, 0, tStop <= tStart ? -1 : tStop * 100, tStart*100)); return S_OK; }

1 0