November 2010 - Wine-commits

Henri Verbeet : wined3d: Use a lookup table in select_card_ati_binary().
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 4503d0cb4b4fa5ab5857980ab232bf7bedfd6cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4503d0cb4b4fa5ab5857980ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:00 2010 +0100 wined3d: Use a lookup table in select_card_ati_binary(). --- dlls/wined3d/directx.c | 124 ++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ceb742..4485491 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1578,89 +1578,59 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ if (WINE_D3D10_CAPABLE(gl_info)) { - /* Radeon EG CYPRESS XT / PRO HD5800 - highend */ - if (strstr(gl_renderer, "HD 5800") /* Radeon EG CYPRESS HD58xx generic renderer string */ - || strstr(gl_renderer, "HD 5850") /* Radeon EG CYPRESS XT */ - || strstr(gl_renderer, "HD 5870")) /* Radeon EG CYPRESS PRO */ - { - return CARD_ATI_RADEON_HD5800; - } - - /* Radeon EG JUNIPER XT / LE HD5700 - midend */ - if (strstr(gl_renderer, "HD 5700") /* Radeon EG JUNIPER HD57xx generic renderer string */ - || strstr(gl_renderer, "HD 5750") /* Radeon EG JUNIPER LE */ - || strstr(gl_renderer, "HD 5770")) /* Radeon EG JUNIPER XT */ - { - return CARD_ATI_RADEON_HD5700; - } - - /* Radeon R7xx HD4800 - highend */ - if (strstr(gl_renderer, "HD 4800") /* Radeon RV7xx HD48xx generic renderer string */ - || strstr(gl_renderer, "HD 4830") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4850") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4870") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4890")) /* Radeon RV790 */ - { - return CARD_ATI_RADEON_HD4800; - } - - /* Radeon R740 HD4700 - midend */ - if (strstr(gl_renderer, "HD 4700") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4770")) /* Radeon RV740 */ - { - return CARD_ATI_RADEON_HD4700; - } - - /* Radeon R730 HD4600 - midend */ - if (strstr(gl_renderer, "HD 4600") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4650") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4670")) /* Radeon RV730 */ - { - return CARD_ATI_RADEON_HD4600; - } - - /* Radeon R710 HD4500/HD4350 - lowend */ - if (strstr(gl_renderer, "HD 4350") /* Radeon RV710 */ - || strstr(gl_renderer, "HD 4550")) /* Radeon RV710 */ - { - return CARD_ATI_RADEON_HD4350; - } - - /* Radeon R6xx HD2900/HD3800 - highend */ - if (strstr(gl_renderer, "HD 2900") - || strstr(gl_renderer, "HD 3870") - || strstr(gl_renderer, "HD 3850")) - { - return CARD_ATI_RADEON_HD2900; - } + unsigned int i; - /* Radeon R6xx HD2600/HD3600 - midend; HD3830 is China-only midend */ - if (strstr(gl_renderer, "HD 2600") - || strstr(gl_renderer, "HD 3830") - || strstr(gl_renderer, "HD 3690") - || strstr(gl_renderer, "HD 3650")) + static const struct { - return CARD_ATI_RADEON_HD2600; + const char *renderer; + enum wined3d_pci_device id; } - - /* Radeon R6xx HD2350/HD2400/HD3400 - lowend - * Note HD2300=DX9, HD2350=DX10 */ - if (strstr(gl_renderer, "HD 2350") - || strstr(gl_renderer, "HD 2400") - || strstr(gl_renderer, "HD 3470") - || strstr(gl_renderer, "HD 3450") - || strstr(gl_renderer, "HD 3430") - || strstr(gl_renderer, "HD 3400")) + cards[] = { - return CARD_ATI_RADEON_HD2350; - } + /* Evergreen */ + {"HD 5870", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ + {"HD 5850", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ + {"HD 5800", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS HD58xx generic renderer string */ + {"HD 5770", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER XT */ + {"HD 5750", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER LE */ + {"HD 5700", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER HD57xx generic renderer string */ + /* R700 */ + {"HD 4890", CARD_ATI_RADEON_HD4800}, /* Radeon RV790 */ + {"HD 4870", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4850", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4830", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4800", CARD_ATI_RADEON_HD4800}, /* Radeon RV7xx HD48xx generic renderer string */ + {"HD 4770", CARD_ATI_RADEON_HD4700}, /* Radeon RV740 */ + {"HD 4700", CARD_ATI_RADEON_HD4700}, /* Radeon RV7xx HD47xx generic renderer string */ + {"HD 4670", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4650", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4600", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4550", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + {"HD 4350", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + /* R600/R700 integrated */ + {"HD 3300", CARD_ATI_RADEON_HD3200}, + {"HD 3200", CARD_ATI_RADEON_HD3200}, + {"HD 3100", CARD_ATI_RADEON_HD3200}, + /* R600 */ + {"HD 3870", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3850", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 2900", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3830", CARD_ATI_RADEON_HD2600}, /* China-only midend */ + {"HD 3690", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3650", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 2600", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3470", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3450", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3430", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2350", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + }; - /* Radeon R6xx/R7xx integrated */ - if (strstr(gl_renderer, "HD 3100") - || strstr(gl_renderer, "HD 3200") - || strstr(gl_renderer, "HD 3300")) + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) { - return CARD_ATI_RADEON_HD3200; + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; } /* Default for when no GPU has been found */

1 0

Henri Verbeet : ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 6fcb33f59f8449d836bf7eb58acd48172bf9ad4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcb33f59f8449d836bf7eb58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:01 2010 +0100 ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN. --- dlls/ddraw/ddraw.c | 27 +++++++++++++++++---------- dlls/ddraw/tests/d3d.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 512fd8e..e155482 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -641,12 +641,15 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; - } + } + + if ((This->cooperative_level & DDSCL_EXCLUSIVE) + && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) + IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); /* Do we switch from fullscreen to non-fullscreen ? */ if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) { - IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); } @@ -656,21 +659,25 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; - HRESULT hr; IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); - hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); - if (FAILED(hr)) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } } This->dest_window = hwnd; } + if ((cooplevel & DDSCL_EXCLUSIVE) + && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + { + HRESULT hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); + if (FAILED(hr)) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + } + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */ diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9066e4e..82fdedf 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3281,6 +3281,7 @@ static void test_wndproc(void) 0, }; + /* DDSCL_EXCLUSIVE replaces the window's window proc. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { @@ -3323,6 +3324,39 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + /* DDSCL_NORMAL doesn't. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + /* The original window proc is only restored by ddraw if the current + * window proc matches the one ddraw set. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) {

1 0

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

10 Nov '10

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 : strmbase: Add support for rendering algorithms to quality control.
by Alexandre Julliard 10 Nov '10

10 Nov '10

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 : quartz: Use quality control in video renderer.
by Alexandre Julliard 10 Nov '10

10 Nov '10

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 10 Nov '10

10 Nov '10

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 : quartz: Add quality control to avi decoder.
by Alexandre Julliard 10 Nov '10

10 Nov '10

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 10 Nov '10

10 Nov '10

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: Fix buffer leak in error path.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: d62b4dcb664a2a6a8579600c975e8213766746f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62b4dcb664a2a6a8579600c9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:44 2010 +0100 winegstreamer: Fix buffer leak in error path. --- dlls/winegstreamer/gstdemux.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d26f853..a6f72c4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -517,10 +517,12 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { } else { BYTE *ptr = NULL; hr = BaseOutputPinImpl_GetDeliveryBuffer(&pin->pin, &sample, NULL, NULL, 0); - freeSamp = TRUE; - if (hr == VFW_E_NOT_CONNECTED) + if (hr == VFW_E_NOT_CONNECTED) { + gst_buffer_unref(buf); return GST_FLOW_NOT_LINKED; + } if (FAILED(hr)) { + gst_buffer_unref(buf); ERR("Didn't get a GST_APP_BUFFER, and could not get a delivery buffer (%x), returning GST_FLOW_WRONG_STATE\n", hr); return GST_FLOW_WRONG_STATE; }

1 0

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

10 Nov '10

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