Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/videorenderer.c | 3 +-- dlls/quartz/vmr9.c | 3 +-- dlls/strmbase/video.c | 3 +-- include/wine/strmbase.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5c2c3934fc..2e770cdf4c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -764,8 +764,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail;
- hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, + hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1a4f85c87c..a2ed46d05d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) goto fail;
hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin, - &renderer_BaseControlVideoFuncTable); + &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail;
diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index d1ebbdf235..081794e9b3 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl = };
HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; - video->pInterfaceLock = cs; video->pPin = pin; video->pFuncsTable = func_table;
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f92a375a56..7f9d2cb64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo IBasicVideo IBasicVideo_iface;
struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin;
const struct BaseControlVideoFuncTable* pFuncsTable; @@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable { } BaseControlVideoFuncTable;
HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); #endif #endif
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/strmbase/pin.c | 23 +++++++---------------- include/wine/strmbase.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2d98168418..9a88246a7f 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -333,16 +333,10 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ }
-HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + iface, debugstr_time(start), debugstr_time(stop), rate);
return S_OK; } @@ -696,7 +690,6 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); @@ -843,17 +836,16 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); }
-HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args;
TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); + iface, debugstr_time(start), debugstr_time(stop), rate);
- args.tStart = This->pin.tStart = tStart; - args.tStop = This->pin.tStop = tStop; - args.rate = This->pin.dRate = dRate; + args.tStart = start; + args.tStop = stop; + args.rate = rate;
return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -994,7 +986,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7f9d2cb64d..f87b726d0a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -38,8 +38,6 @@ struct strmbase_pin WCHAR name[128]; IPin *peer; AM_MEDIA_TYPE mtCurrent; - REFERENCE_TIME tStart, tStop; - double dRate;
const struct BasePinFuncTable* pFuncsTable; };
-
Zebediah Figura