ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strmbase: Get rid of the "enumMediaFunction" field from IEnumMediaTypesImpl. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-09-23 19:33:23 -05:00 committed by Alexandre Julliard
parent bf01248ccb
commit 750efd19a7
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/strmbase/mediatype.c
View File

@ -82,7 +82,6 @@ typedef struct IEnumMediaTypesImpl
IEnumMediaTypes IEnumMediaTypes_iface; IEnumMediaTypes IEnumMediaTypes_iface;
LONG refCount; LONG refCount;
BasePin *basePin; BasePin *basePin;
BasePin_GetMediaType enumMediaFunction;
ULONG count; ULONG count;
ULONG uIndex; ULONG uIndex;
} IEnumMediaTypesImpl; } IEnumMediaTypesImpl;
@ -94,11 +93,9 @@ static inline IEnumMediaTypesImpl *impl_from_IEnumMediaTypes(IEnumMediaTypes *if
static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl;
HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType enumFunc, IEnumMediaTypes **ppEnum) HRESULT enum_media_types_create(BasePin *basePin, IEnumMediaTypes **ppEnum)
{ {
ULONG i;
IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl)); IEnumMediaTypesImpl * pEnumMediaTypes = CoTaskMemAlloc(sizeof(IEnumMediaTypesImpl));
AM_MEDIA_TYPE amt;
*ppEnum = NULL; *ppEnum = NULL;
@ -108,18 +105,11 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e
pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl;
pEnumMediaTypes->refCount = 1; pEnumMediaTypes->refCount = 1;
pEnumMediaTypes->uIndex = 0; pEnumMediaTypes->uIndex = 0;
pEnumMediaTypes->enumMediaFunction = enumFunc;
IPin_AddRef(&basePin->IPin_iface); IPin_AddRef(&basePin->IPin_iface);
pEnumMediaTypes->basePin = basePin; pEnumMediaTypes->basePin = basePin;
i = 0; IEnumMediaTypes_Reset(&pEnumMediaTypes->IEnumMediaTypes_iface);
while (enumFunc(basePin, i, &amt) == S_OK)
{
FreeMediaType(&amt);
i++;
}
pEnumMediaTypes->count = i;
*ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface;
return S_OK; return S_OK;
} }
@ -179,7 +169,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface,
for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++) for (i = 0; i < count && enummt->uIndex + i < enummt->count; i++)
{ {
if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE))) if (!(mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))
|| FAILED(enummt->enumMediaFunction(enummt->basePin, enummt->uIndex + i, mts[i]))) || FAILED(enummt->basePin->pFuncsTable->pfnGetMediaType(enummt->basePin, enummt->uIndex + i, mts[i])))
{ {
while (i--) while (i--)
DeleteMediaType(mts[i]); DeleteMediaType(mts[i]);
@ -216,7 +206,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface)
TRACE("(%p)->()\n", iface); TRACE("(%p)->()\n", iface);
i = 0; i = 0;
while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) while (This->basePin->pFuncsTable->pfnGetMediaType(This->basePin, i, &amt) == S_OK)
{ {
FreeMediaType(&amt); FreeMediaType(&amt);
i++; i++;
@ -234,7 +224,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMe
TRACE("(%p)->(%p)\n", iface, ppEnum); TRACE("(%p)->(%p)\n", iface, ppEnum);
hr = EnumMediaTypes_Construct(This->basePin, This->enumMediaFunction, ppEnum); hr = enum_media_types_create(This->basePin, ppEnum);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
return IEnumMediaTypes_Skip(*ppEnum, This->uIndex); return IEnumMediaTypes_Skip(*ppEnum, This->uIndex);

2
dlls/strmbase/pin.c
View File

@ -301,7 +301,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_me
TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types); TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types);
return EnumMediaTypes_Construct(pin, pin->pFuncsTable->pfnGetMediaType, enum_media_types); return enum_media_types_create(pin, enum_media_types);
} }
HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin)

3
dlls/strmbase/strmbase_private.h
View File

@ -63,8 +63,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s
void QualityControlRender_EndRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This);
HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins); HRESULT enum_pins_create(struct strmbase_filter *filter, IEnumPins **enum_pins);
HRESULT WINAPI EnumMediaTypes_Construct(BasePin *pin, BasePin_GetMediaType enumFunc, HRESULT enum_media_types_create(BasePin *pin, IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN;
IEnumMediaTypes **enum_media_types) DECLSPEC_HIDDEN;
HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start);
HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface);