wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Józef Kucia : wined3d: Implement SV_VertexID in GLSL backend.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 05f6f111bf7fb843eb5c7f275e30b9bcb48171f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f6f111bf7fb843eb5c7f275… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:37 2016 +0200 wined3d: Implement SV_VertexID in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index df50f6a..4e58262 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1914,7 +1914,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) + if (e->sysval_semantic == WINED3D_SV_VERTEX_ID) + shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_VertexID), 0.0, 0.0, 0.0);\n", + prefix, e->register_idx); + else if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else

1 0

Józef Kucia : wined3d: Add SV_VertexID sysval semantic.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 2d97dbf87b042fe62d90ce5015c253544e34c757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d97dbf87b042fe62d90ce501… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:36 2016 +0200 wined3d: Add SV_VertexID sysval semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + include/wine/wined3d.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f8c335c..01c5d50 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -232,6 +232,7 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a770d7f..8429bea 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -744,6 +744,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8, WINED3D_SV_IS_FRONT_FACE = 9,

1 0

Józef Kucia : wined3d: Use d3d_perf channel for performance warnings.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 8e566322341d3140e9a3c979b2438cdcd385e834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e566322341d3140e9a3c979b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 18 00:04:35 2016 +0200 wined3d: Use d3d_perf channel for performance warnings. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4fb2251..2f00e87 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1897,7 +1897,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { - FIXME("Doing a pixel by pixel copy from the framebuffer to a texture, expect major performance issues\n"); + FIXME_(d3d_perf)("Doing a pixel by pixel copy from the framebuffer to a texture.\n"); if (filter != WINED3D_TEXF_NONE && filter != WINED3D_TEXF_POINT) ERR("Texture filtering not supported in direct blit.\n"); @@ -2910,8 +2910,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_RGB) { - /* Performance warning... */ - FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); + FIXME_(d3d_perf)("Downloading RGB surface %p to reload it as sRGB.\n", surface); surface_load_location(surface, context, texture->resource.map_binding); } } @@ -2920,8 +2919,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if ((sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | texture->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_SRGB) { - /* Performance warning... */ - FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); + FIXME_(d3d_perf)("Downloading sRGB surface %p to reload it as RGB.\n", surface); surface_load_location(surface, context, texture->resource.map_binding); } }

1 0

Nikolay Sivov : comctl32/header: Implement HDM_SETFILTERCHANGETIMEOUT.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: d1594aadda74b577a00e8d07fc3cc9512cd587f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1594aadda74b577a00e8d07f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 23:42:52 2016 +0300 comctl32/header: Implement HDM_SETFILTERCHANGETIMEOUT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 13 ++++++++++++- dlls/comctl32/tests/header.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index fb6a815..edfe385 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -84,6 +84,7 @@ typedef struct INT iHotItem; /* index of hot item (cursor is over this item) */ INT iHotDivider; /* index of the hot divider (used while dragging an item or by HDM_SETHOTDIVIDER) */ INT iMargin; /* width of the margin that surrounds a bitmap */ + INT filter_change_timeout; /* change timeout set with HDM_SETFILTERCHANGETIMEOUT */ HIMAGELIST himl; /* handle to an image list (may be 0) */ HEADER_ITEM *items; /* pointer to array of HEADER_ITEM's */ @@ -1540,6 +1541,7 @@ HEADER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->iMargin = 3*GetSystemMetrics(SM_CXEDGE); infoPtr->nNotifyFormat = SendMessageW (infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); + infoPtr->filter_change_timeout = 1000; hdc = GetDC (0); hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT)); @@ -2054,6 +2056,14 @@ static LRESULT HEADER_ThemeChanged(const HEADER_INFO *infoPtr) return 0; } +static INT HEADER_SetFilterChangeTimeout(HEADER_INFO *infoPtr, INT timeout) +{ + INT old_timeout = infoPtr->filter_change_timeout; + + if (timeout != 0) + infoPtr->filter_change_timeout = timeout; + return old_timeout; +} static LRESULT WINAPI HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -2112,7 +2122,8 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case HDM_SETBITMAPMARGIN: return HEADER_SetBitmapMargin(infoPtr, (INT)wParam); -/* case HDM_SETFILTERCHANGETIMEOUT: */ + case HDM_SETFILTERCHANGETIMEOUT: + return HEADER_SetFilterChangeTimeout(infoPtr, (INT)lParam); case HDM_SETHOTDIVIDER: return HEADER_SetHotDivider(infoPtr, wParam, lParam); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 43fd175..3dc102d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -994,8 +994,19 @@ static void test_hdm_filterMessages(HWND hParent) ok_sequence(sequences, PARENT_SEQ_INDEX, add_header_to_parent_seq, "adder header control to parent", FALSE); + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); + ok(timeout == 1000, "got %d\n", timeout); + + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, 0); + ok(timeout == 1000, "got %d\n", timeout); + + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 0, -100); + ok(timeout == 1000, "got %d\n", timeout); + timeout = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, 100); - SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, timeout); + ok(timeout == -100, "got %d\n", timeout); + retVal = SendMessageA(hChild, HDM_SETFILTERCHANGETIMEOUT, 1, timeout); + ok(retVal == 100, "got %d\n", retVal); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Andrew Eikum : strmbase: Initialize QualityControl struct on allocation.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 97fea6d80e043b5411c82cbc0b53d236e4d6532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fea6d80e043b5411c82cbc0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 14:02:49 2016 -0500 strmbase: Initialize QualityControl struct on allocation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index ce14c72..46e0193 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -43,7 +43,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl { QualityControlImpl *This; TRACE("%p, %p, %p\n", input, self, ppv); - *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); + *ppv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(QualityControlImpl)); if (!*ppv) return E_OUTOFMEMORY; This = *ppv; @@ -51,6 +51,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl This->self = self; This->tonotify = NULL; This->clock = NULL; + This->current_rstart = This->current_rstop = -1; TRACE("-> %p\n", This); return S_OK; }

1 0

Andrew Eikum : strmbase: Improve QualityControl tracing.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 0025649714f25af020862be8aa1ef82ca8d8f99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0025649714f25af020862be8a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 13:43:36 2016 -0500 strmbase: Improve QualityControl tracing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 10 ++++-- dlls/strmbase/qualitycontrol.c | 72 +++++++++++++++++++++++++++++++--------- dlls/winegstreamer/gstdemux.c | 5 ++- dlls/winegstreamer/gsttffilter.c | 5 ++- 4 files changed, 72 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 44a032a..533db13 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1539,7 +1539,10 @@ static HRESULT WINAPI AviMuxOut_QualityControl_Notify(IQualityControl *iface, IBaseFilter *pSelf, Quality q) { AviMux *This = impl_from_out_IQualityControl(iface); - FIXME("(%p)->(%p Quality)\n", This, pSelf); + FIXME("(%p)->(%p { 0x%x %u %s %s })\n", This, pSelf, + q.Type, q.Proportion, + wine_dbgstr_longlong(q.Late), + wine_dbgstr_longlong(q.TimeStamp)); return E_NOTIMPL; } @@ -2273,7 +2276,10 @@ static HRESULT WINAPI AviMuxIn_QualityControl_Notify(IQualityControl *iface, { AviMuxIn *avimuxin = AviMuxIn_from_IQualityControl(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p Quality)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSelf); + FIXME("(%p:%s)->(%p { 0x%x %u %s %s })\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pSelf, + q.Type, q.Proportion, + wine_dbgstr_longlong(q.Late), + wine_dbgstr_longlong(q.TimeStamp)); return E_NOTIMPL; } diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 2e32b57..ce14c72 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -36,8 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); -HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { +#define XTIME_FMT "%u.%03u" +#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) + +HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) +{ QualityControlImpl *This; + TRACE("%p, %p, %p\n", input, self, ppv); *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); if (!*ppv) return E_OUTOFMEMORY; @@ -46,6 +51,7 @@ HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControl This->self = self; This->tonotify = NULL; This->clock = NULL; + TRACE("-> %p\n", This); return S_OK; } @@ -54,26 +60,36 @@ void QualityControlImpl_Destroy(QualityControlImpl *This) HeapFree(GetProcessHeap(),0,This); } -HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) { +HRESULT WINAPI QualityControlImpl_QueryInterface(IQualityControl *iface, REFIID riid, void **ppv) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_QueryInterface(This->self, riid, ppv); } -ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) { +ULONG WINAPI QualityControlImpl_AddRef(IQualityControl *iface) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_AddRef(This->self); } -ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) { +ULONG WINAPI QualityControlImpl_Release(IQualityControl *iface) +{ QualityControlImpl *This = (QualityControlImpl*)iface; return IBaseFilter_Release(This->self); } -HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { +HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) +{ HRESULT hr = S_FALSE; QualityControlImpl *This = (QualityControlImpl*)iface; + + TRACE("%p %p { 0x%x %u " XTIME_FMT " " XTIME_FMT " }\n", + This, sender, qm.Type, qm.Proportion, + XTIME(qm.Late), XTIME(qm.TimeStamp)); + if (This->tonotify) return IQualityControl_Notify(This->tonotify, This->self, qm); + if (This->input) { IPin *to = NULL; IPin_ConnectedTo(This->input, &to); @@ -87,11 +103,14 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se IPin_Release(to); } } + return hr; } -HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) { +HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify) +{ QualityControlImpl *This = (QualityControlImpl*)iface; + TRACE("%p %p\n", This, tonotify); This->tonotify = tonotify; return S_OK; } @@ -108,7 +127,9 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) -void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) { +void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) +{ + TRACE("%p " XTIME_FMT "\n", This, XTIME(tStart)); This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; @@ -118,7 +139,9 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) } -void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) { +void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock) +{ + TRACE("%p %p\n", This, clock); This->clock = clock; } @@ -127,6 +150,9 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME { REFERENCE_TIME max_lateness = 200000; + TRACE("%p " XTIME_FMT " " XTIME_FMT " " XTIME_FMT "\n", + This, XTIME(jitter), XTIME(start), XTIME(stop)); + /* we can add a valid stop time */ if (stop >= start) max_lateness += stop; @@ -148,8 +174,12 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) { +HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) +{ REFERENCE_TIME start = -1, stop = -1, jitter = 0; + + TRACE("%p %p %p\n", This, sample, ev); + This->current_rstart = This->current_rstop = -1; This->current_jitter = 0; if (!This->clock || FAILED(IMediaSample_GetTime(sample, &start, &stop))) @@ -189,6 +219,8 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; double rate; + TRACE("%p\n", priv); + if (!priv->clock || priv->current_rstart < 0) return; @@ -228,14 +260,12 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) pt = priv->avg_pt; } -#define XTIME(u) (int)(u/10000000), (int)((u / 10000)%1000) - TRACE("start: %u.%03u, entered %u.%03u, left %u.%03u, pt: %u.%03u, " - "duration %u.%03u, jitter %u.%03u\n", XTIME(start), XTIME(entered), + TRACE("start: " XTIME_FMT ", entered " XTIME_FMT ", left " XTIME_FMT ", pt: " XTIME_FMT ", " + "duration " XTIME_FMT ", jitter " XTIME_FMT "\n", XTIME(start), XTIME(entered), XTIME(left), XTIME(pt), XTIME(duration), XTIME(jitter)); - TRACE("avg_duration: %u.%03u, avg_pt: %u.%03u, avg_rate: %g\n", + TRACE("avg_duration: " XTIME_FMT ", avg_pt: " XTIME_FMT ", avg_rate: %g\n", XTIME(priv->avg_duration), XTIME(priv->avg_pt), priv->avg_rate); -#undef XTIME /* collect running averages. for first observations, we copy the * values */ @@ -297,15 +327,25 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This) { +void QualityControlRender_BeginRender(QualityControlImpl *This) +{ + TRACE("%p\n", This); + This->start = -1; + if (!This->clock) return; + IReferenceClock_GetTime(This->clock, &This->start); + TRACE("at: " XTIME_FMT "\n", XTIME(This->start)); } -void QualityControlRender_EndRender(QualityControlImpl *This) { +void QualityControlRender_EndRender(QualityControlImpl *This) +{ REFERENCE_TIME elapsed; + + TRACE("%p\n", This); + if (!This->clock || This->start < 0 || FAILED(IReferenceClock_GetTime(This->clock, &This->stop))) return; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7adbc5..f0b30e2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1664,7 +1664,10 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil { GSTOutPin *pin = impl_from_IQualityControl(iface); REFERENCE_TIME late = qm.Late; - TRACE("(%p)->(%p, qm)\n", pin, sender); + TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, + qm.Type, qm.Proportion, + wine_dbgstr_longlong(qm.Late), + wine_dbgstr_longlong(qm.TimeStamp)); mark_wine_thread(); if (qm.Late < 0 && -qm.Late > qm.TimeStamp) late = -qm.TimeStamp; diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 6c60fe3..cc544d0 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -478,7 +478,10 @@ static HRESULT WINAPI Gstreamer_transform_QOS(TransformFilter *iface, IBaseFilte GstTfImpl *This = (GstTfImpl*)iface; REFERENCE_TIME late = qm.Late; - TRACE("%p %p qm\n", This, sender); + TRACE("%p %p { 0x%x %u %s %s }\n", This, sender, + qm.Type, qm.Proportion, + wine_dbgstr_longlong(qm.Late), + wine_dbgstr_longlong(qm.TimeStamp)); mark_wine_thread();

1 0

Andrew Eikum : quartz: Use correct scale for quality control proportion.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: b5f2833dbee16fa2881d7c9742b3dfb58958e18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f2833dbee16fa2881d7c974… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 17 13:43:32 2016 -0500 quartz: Use correct scale for quality control proportion. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8e34655..d6c4617 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -405,7 +405,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(BaseRenderer *iface, IMediaSam else if (jitter < 0) jitter = 0; q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = 1.; + q.Proportion = 1000; q.Late = jitter; q.TimeStamp = tStart; IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, (IBaseFilter*)This, q);

1 0

Maarten Lankhorst : dsound: Remove unconditional memory allocation in mixing thread.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: db316c124365ef73c03e6c8cb3e79a20c72ba856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db316c124365ef73c03e6c8cb… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:41:04 2016 -0500 dsound: Remove unconditional memory allocation in mixing thread. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 1 + dlls/dsound/dsound_private.h | 4 ++-- dlls/dsound/mixer.c | 24 ++++++++++++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7519951..fb9fd66 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -234,6 +234,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioStreamVolume_Release(device->volume); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); + HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer); RtlDeleteResource(&device->buffer_list_lock); device->mixlock.DebugInfo->Spare[0] = 0; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 0ca8aec..d063046 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -87,8 +87,8 @@ struct DirectSoundDevice int speaker_num[DS_MAX_CHANNELS]; int num_speakers; int lfe_channel; - float *tmp_buffer; - DWORD tmp_buffer_len; + float *tmp_buffer, *cp_buffer; + DWORD tmp_buffer_len, cp_buffer_len; DSVOLUMEPAN volpan; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 727ceb8..217d4ce 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -292,18 +292,29 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * UINT fir_cachesize = (fir_len + dsbfirstep - 2) / dsbfirstep; UINT required_input = max_ipos + fir_cachesize; + float *intermediate, *fir_copy, *itmp; + + DWORD len = required_input * channels; + len += fir_cachesize; + len *= sizeof(float); + + if (!dsb->device->cp_buffer) { + dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); + dsb->device->cp_buffer_len = len; + } else if (len > dsb->device->cp_buffer_len) { + dsb->device->cp_buffer = HeapReAlloc(GetProcessHeap(), 0, dsb->device->cp_buffer, len); + dsb->device->cp_buffer_len = len; + } - float* intermediate = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * required_input * channels); + fir_copy = dsb->device->cp_buffer; + intermediate = fir_copy + fir_cachesize; - float* fir_copy = HeapAlloc(GetProcessHeap(), 0, - sizeof(float) * fir_cachesize); /* Important: this buffer MUST be non-interleaved * if you want -msse3 to have any effect. * This is good for CPU cache effects, too. */ - float* itmp = intermediate; + itmp = intermediate; for (channel = 0; channel < channels; channel++) for (i = 0; i < required_input; i++) *(itmp++) = get_current_sample(dsb, @@ -338,9 +349,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - HeapFree(GetProcessHeap(), 0, fir_copy); - HeapFree(GetProcessHeap(), 0, intermediate); - return max_ipos; }

1 0

Maarten Lankhorst : dsound: Remove state machine from render buffer.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 5b0914ece97b0732796313588f69ce1085664498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0914ece97b0732796313588… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:51 2016 -0500 dsound: Remove state machine from render buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/mixer.c | 36 +------------------------ dlls/dsound/primary.c | 64 ++++---------------------------------------- 4 files changed, 8 insertions(+), 96 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 195da0b..7519951 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -135,7 +135,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) device->ref = 1; device->priolevel = DSSCL_NORMAL; - device->state = STATE_STOPPED; + device->stopped = 1; device->speaker_config = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); DSOUND_ParseSpeakerConfig(device); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 3da0c19..0ca8aec 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -76,7 +76,7 @@ struct DirectSoundDevice DWORD priolevel, sleeptime; PWAVEFORMATEX pwfx, primary_pwfx; LPBYTE buffer; - DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; + DWORD writelead, buflen, aclen, fraglen, playpos, pad, stopped; int nrofbuffers; IDirectSoundBufferImpl** buffers; RTL_RWLOCK buffer_list_lock; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 4ca0af1..727ceb8 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -694,10 +694,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) * also wipe out just-played sound data */ if (!pad) WARN("Probable buffer underrun\n"); - else if (device->state == STATE_STOPPED || - device->state == STATE_STARTING) { - TRACE("Buffer restarting\n"); - } hr = IAudioRenderClient_GetBuffer(device->render, maxq / block, (void*)&buffer); if(FAILED(hr)){ @@ -724,23 +720,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ERR("ReleaseBuffer failed: %08x\n", hr); device->pad += maxq; - - if (maxq) { - if (device->state == STATE_STARTING || - device->state == STATE_STOPPED) { - if(DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else if (device->state == STATE_STARTING) - device->state = STATE_PLAYING; - else - device->state = STATE_STOPPING; - } - } else if (!pad && !maxq && (all_stopped == TRUE) && - (device->state == STATE_STOPPING)) { - device->state = STATE_STOPPED; - DSOUND_PrimaryStop(device); - } - } else if (device->state != STATE_STOPPED) { + } else if (!device->stopped) { if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) { @@ -748,20 +728,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) DSOUND_WaveQueue(device, device->buffer, writepos + maxq - device->buflen); } else DSOUND_WaveQueue(device, device->buffer + writepos, maxq); - - /* in the DSSCL_WRITEPRIMARY mode, the app is totally in charge... */ - if (device->state == STATE_STARTING) { - if (DSOUND_PrimaryPlay(device) != DS_OK) - WARN("DSOUND_PrimaryPlay failed\n"); - else - device->state = STATE_PLAYING; - } - else if (device->state == STATE_STOPPING) { - if (DSOUND_PrimaryStop(device) != DS_OK) - WARN("DSOUND_PrimaryStop failed\n"); - else - device->state = STATE_STOPPED; - } } LeaveCriticalSection(&(device->mixlock)); diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 72c9475..0dc16f0 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -272,11 +272,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, HeapFree(GetProcessHeap(), 0, device->pwfx); device->pwfx = wfx; - if (device->state == STATE_PLAYING) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_STOPPED; - device->writelead = (wfx->nSamplesPerSec / 100) * wfx->nBlockAlign; TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen); @@ -384,7 +379,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) return S_OK; err_service: - ERR("GetService failed: %08x\n", hres); + WARN("GetService failed: %08x\n", hres); err: device->speaker_config = oldspeakerconfig; DSOUND_ParseSpeakerConfig(device); @@ -421,36 +416,6 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) return DS_OK; } -HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Start(device->client); - if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ - WARN("Start failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - -HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) -{ - HRESULT hr; - - TRACE("(%p)\n", device); - - hr = IAudioClient_Stop(device->client); - if(FAILED(hr)){ - WARN("Stop failed: %08x\n", hr); - return hr; - } - - return DS_OK; -} - WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) { WAVEFORMATEX *pwfx; @@ -698,16 +663,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Play(IDirectSoundBuffer *iface, DWORD re return DSERR_INVALIDPARAM; } - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_STOPPED) - device->state = STATE_STARTING; - else if (device->state == STATE_STOPPING) - device->state = STATE_PLAYING; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 0; return DS_OK; } @@ -718,16 +674,7 @@ static HRESULT WINAPI PrimaryBufferImpl_Stop(IDirectSoundBuffer *iface) DirectSoundDevice *device = This->device; TRACE("(%p)\n", iface); - /* **** */ - EnterCriticalSection(&(device->mixlock)); - - if (device->state == STATE_PLAYING) - device->state = STATE_STOPPING; - else if (device->state == STATE_STARTING) - device->state = STATE_STOPPED; - - LeaveCriticalSection(&(device->mixlock)); - /* **** */ + device->stopped = 1; return DS_OK; } @@ -795,7 +742,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i *playpos = mixpos; if (writepos) { *writepos = mixpos; - if (device->state != STATE_STOPPED) { + if (!device->stopped) { /* apply the documented 10ms lead to writepos */ *writepos += device->writelead; *writepos %= device->buflen; @@ -821,8 +768,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetStatus(IDirectSoundBuffer *iface, DWO } *status = 0; - if ((device->state == STATE_STARTING) || - (device->state == STATE_PLAYING)) + if (!device->stopped) *status |= DSBSTATUS_PLAYING | DSBSTATUS_LOOPING; TRACE("status=%x\n", *status);

1 0

Maarten Lankhorst : dsound: Prevent reopening device from leaving dsound object in invalid state.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 2fb97be1871a78ea6a2889ed975d33515d5468ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb97be1871a78ea6a2889ed9… Author: Maarten Lankhorst <wine(a)mblankhorst.nl> Date: Tue May 17 13:40:33 2016 -0500 dsound: Prevent reopening device from leaving dsound object in invalid state. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 49 +++---- dlls/dsound/dsound_private.h | 3 - dlls/dsound/primary.c | 331 ++++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb97be1871a78ea6a288…

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016