Skip to content

W
wine-winehq
Commit f46fe6d3 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

strmbase: Rename pfnGetMediaType() to pin_get_media_type().

And remove the unnecessary calling convention. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 9f1909be
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 54 deletions
dlls/qcap/avico.c
View file @ f46fe6d3
...@@ -406,12 +406,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE ...@@ -406,12 +406,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE
return res == ICERR_OK ? S_OK : S_FALSE; return res == ICERR_OK ? S_OK : S_FALSE;
} }
static HRESULT WINAPI AVICompressorIn_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
TRACE("(%p)->(%d %p)\n", base, iPosition, amt);
return S_FALSE;
}
static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample) static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *pSample)
{ {
AVICompressor *This = impl_from_strmbase_pin(&base->pin); AVICompressor *This = impl_from_strmbase_pin(&base->pin);
...@@ -502,7 +496,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample * ...@@ -502,7 +496,7 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *
static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl =
{ {
.base.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.base.pfnGetMediaType = AVICompressorIn_GetMediaType, .base.pin_get_media_type = strmbase_pin_get_media_type,
.pfnReceive = AVICompressorIn_Receive, .pfnReceive = AVICompressorIn_Receive,
}; };
...@@ -532,7 +526,7 @@ static const IPinVtbl AVICompressorOutputPinVtbl = { ...@@ -532,7 +526,7 @@ static const IPinVtbl AVICompressorOutputPinVtbl = {
BasePinImpl_NewSegment BasePinImpl_NewSegment
}; };
static HRESULT WINAPI AVICompressorOut_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{ {
AVICompressor *This = impl_from_strmbase_filter(base->filter); AVICompressor *This = impl_from_strmbase_filter(base->filter);
...@@ -580,13 +574,10 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(struct strmbase_source *b ...@@ -580,13 +574,10 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(struct strmbase_source *b
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
{ .base.pin_get_media_type = source_get_media_type,
NULL, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
AVICompressorOut_GetMediaType .pfnDecideBufferSize = AVICompressorOut_DecideBufferSize,
}, .pfnDecideAllocator = AVICompressorOut_DecideAllocator,
BaseOutputPinImpl_AttemptConnection,
AVICompressorOut_DecideBufferSize,
AVICompressorOut_DecideAllocator,
}; };
IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
......
dlls/qcap/avimux.c
View file @ f46fe6d3
...@@ -1174,7 +1174,7 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, ...@@ -1174,7 +1174,7 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base,
return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt); return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt);
} }
static HRESULT WINAPI AviMuxOut_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) static HRESULT source_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{ {
TRACE("(%p)->(%d %p)\n", base, iPosition, amt); TRACE("(%p)->(%d %p)\n", base, iPosition, amt);
...@@ -1224,7 +1224,7 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, ...@@ -1224,7 +1224,7 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base,
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = AviMuxOut_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = AviMuxOut_AttemptConnection, .pfnAttemptConnection = AviMuxOut_AttemptConnection,
.pfnDecideAllocator = AviMuxOut_DecideAllocator, .pfnDecideAllocator = AviMuxOut_DecideAllocator,
}; };
...@@ -1384,11 +1384,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE ...@@ -1384,11 +1384,6 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE
return S_FALSE; return S_FALSE;
} }
static HRESULT WINAPI AviMuxIn_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
return S_FALSE;
}
static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample) static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample)
{ {
AviMux *avimux = impl_from_strmbase_filter(base->pin.filter); AviMux *avimux = impl_from_strmbase_filter(base->pin.filter);
...@@ -1495,7 +1490,7 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample ...@@ -1495,7 +1490,7 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample
static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable = static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable =
{ {
.base.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.base.pfnGetMediaType = AviMuxIn_GetMediaType, .base.pin_get_media_type = strmbase_pin_get_media_type,
.pfnReceive = AviMuxIn_Receive, .pfnReceive = AviMuxIn_Receive,
}; };
......
dlls/qcap/smartteefilter.c
View file @ f46fe6d3
...@@ -179,7 +179,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE ...@@ -179,7 +179,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE
return S_OK; return S_OK;
} }
static HRESULT WINAPI SmartTeeFilterInput_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) static HRESULT sink_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{ {
SmartTeeFilter *This = impl_from_strmbase_pin(base); SmartTeeFilter *This = impl_from_strmbase_pin(base);
HRESULT hr; HRESULT hr;
...@@ -322,7 +322,7 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp ...@@ -322,7 +322,7 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp
static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = static const BaseInputPinFuncTable SmartTeeFilterInputFuncs =
{ {
.base.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.base.pfnGetMediaType = SmartTeeFilterInput_GetMediaType, .base.pin_get_media_type = sink_get_media_type,
.pfnReceive = SmartTeeFilterInput_Receive, .pfnReceive = SmartTeeFilterInput_Receive,
}; };
...@@ -367,7 +367,7 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY ...@@ -367,7 +367,7 @@ static HRESULT capture_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY
return S_OK; return S_OK;
} }
static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) static HRESULT capture_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{ {
SmartTeeFilter *This = impl_from_strmbase_pin(base); SmartTeeFilter *This = impl_from_strmbase_pin(base);
TRACE("(%p, %d, %p)\n", This, iPosition, amt); TRACE("(%p, %d, %p)\n", This, iPosition, amt);
...@@ -391,7 +391,7 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_sour ...@@ -391,7 +391,7 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(struct strmbase_sour
static const struct strmbase_source_ops capture_ops = static const struct strmbase_source_ops capture_ops =
{ {
.base.pin_query_accept = capture_query_accept, .base.pin_query_accept = capture_query_accept,
.base.pfnGetMediaType = SmartTeeFilterCapture_GetMediaType, .base.pin_get_media_type = capture_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideAllocator = SmartTeeFilterCapture_DecideAllocator, .pfnDecideAllocator = SmartTeeFilterCapture_DecideAllocator,
}; };
...@@ -437,7 +437,7 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY ...@@ -437,7 +437,7 @@ static HRESULT preview_query_accept(struct strmbase_pin *base, const AM_MEDIA_TY
return S_OK; return S_OK;
} }
static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt) static HRESULT preview_get_media_type(struct strmbase_pin *base, int iPosition, AM_MEDIA_TYPE *amt)
{ {
SmartTeeFilter *This = impl_from_strmbase_pin(base); SmartTeeFilter *This = impl_from_strmbase_pin(base);
TRACE("(%p, %d, %p)\n", This, iPosition, amt); TRACE("(%p, %d, %p)\n", This, iPosition, amt);
...@@ -461,7 +461,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour ...@@ -461,7 +461,7 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(struct strmbase_sour
static const struct strmbase_source_ops preview_ops = static const struct strmbase_source_ops preview_ops =
{ {
.base.pin_query_accept = preview_query_accept, .base.pin_query_accept = preview_query_accept,
.base.pfnGetMediaType = SmartTeeFilterPreview_GetMediaType, .base.pin_get_media_type = preview_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator, .pfnDecideAllocator = SmartTeeFilterPreview_DecideAllocator,
}; };
......
dlls/qcap/vfwcapture.c
View file @ f46fe6d3
...@@ -518,7 +518,7 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE ...@@ -518,7 +518,7 @@ static HRESULT source_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE
return qcap_driver_check_format(filter->driver_info, mt); return qcap_driver_check_format(filter->driver_info, mt);
} }
static HRESULT WINAPI VfwPin_GetMediaType(struct strmbase_pin *pin, int iPosition, AM_MEDIA_TYPE *pmt) static HRESULT source_get_media_type(struct strmbase_pin *pin, int iPosition, AM_MEDIA_TYPE *pmt)
{ {
VfwCapture *filter = impl_from_strmbase_pin(pin); VfwCapture *filter = impl_from_strmbase_pin(pin);
AM_MEDIA_TYPE *vfw_pmt; AM_MEDIA_TYPE *vfw_pmt;
...@@ -557,7 +557,7 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, ...@@ -557,7 +557,7 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface,
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = VfwPin_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideBufferSize = VfwPin_DecideBufferSize, .pfnDecideBufferSize = VfwPin_DecideBufferSize,
.pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,
......
dlls/quartz/filesource.c
View file @ f46fe6d3
...@@ -591,7 +591,7 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY ...@@ -591,7 +591,7 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY
return S_FALSE; return S_FALSE;
} }
static HRESULT WINAPI FileAsyncReaderPin_GetMediaType(struct strmbase_pin *iface, int index, AM_MEDIA_TYPE *mt) static HRESULT source_get_media_type(struct strmbase_pin *iface, int index, AM_MEDIA_TYPE *mt)
{ {
AsyncReader *filter = impl_from_strmbase_pin(iface); AsyncReader *filter = impl_from_strmbase_pin(iface);
...@@ -704,7 +704,7 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source ...@@ -704,7 +704,7 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(struct strmbase_source
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = FileAsyncReaderPin_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection, .pfnAttemptConnection = FileAsyncReaderPin_AttemptConnection,
.pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize, .pfnDecideBufferSize = FileAsyncReaderPin_DecideBufferSize,
.pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,
......
dlls/strmbase/mediatype.c
View file @ f46fe6d3
...@@ -169,7 +169,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes *iface, ...@@ -169,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->basePin->pFuncsTable->pfnGetMediaType(enummt->basePin, enummt->uIndex + i, mts[i]))) || FAILED(enummt->basePin->pFuncsTable->pin_get_media_type(enummt->basePin, enummt->uIndex + i, mts[i])))
{ {
while (i--) while (i--)
DeleteMediaType(mts[i]); DeleteMediaType(mts[i]);
...@@ -206,7 +206,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) ...@@ -206,7 +206,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface)
TRACE("(%p)->()\n", iface); TRACE("(%p)->()\n", iface);
i = 0; i = 0;
while (This->basePin->pFuncsTable->pfnGetMediaType(This->basePin, i, &amt) == S_OK) while (This->basePin->pFuncsTable->pin_get_media_type(This->basePin, i, &amt) == S_OK)
{ {
FreeMediaType(&amt); FreeMediaType(&amt);
i++; i++;
......
dlls/strmbase/pin.c
View file @ f46fe6d3
...@@ -153,7 +153,7 @@ static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE * ...@@ -153,7 +153,7 @@ static BOOL CompareMediaTypes(const AM_MEDIA_TYPE * pmt1, const AM_MEDIA_TYPE *
} }
/*** Common Base Pin function */ /*** Common Base Pin function */
HRESULT WINAPI BasePinImpl_GetMediaType(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) HRESULT strmbase_pin_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt)
{ {
if (iPosition < 0) if (iPosition < 0)
return E_INVALIDARG; return E_INVALIDARG;
......
dlls/strmbase/renderer.c
View file @ f46fe6d3
...@@ -226,7 +226,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample *samp ...@@ -226,7 +226,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample *samp
static const BaseInputPinFuncTable input_BaseInputFuncTable = static const BaseInputPinFuncTable input_BaseInputFuncTable =
{ {
.base.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.base.pfnGetMediaType = BasePinImpl_GetMediaType, .base.pin_get_media_type = strmbase_pin_get_media_type,
.pfnReceive = BaseRenderer_Receive, .pfnReceive = BaseRenderer_Receive,
}; };
......
dlls/strmbase/transform.c
View file @ f46fe6d3
...@@ -110,7 +110,7 @@ static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(struct strmbase_so ...@@ -110,7 +110,7 @@ static HRESULT WINAPI TransformFilter_Output_DecideBufferSize(struct strmbase_so
return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest); return pTransformFilter->pFuncsTable->pfnDecideBufferSize(pTransformFilter, pAlloc, ppropInputRequest);
} }
static HRESULT WINAPI TransformFilter_Output_GetMediaType(struct strmbase_pin *This, int iPosition, AM_MEDIA_TYPE *pmt) static HRESULT source_get_media_type(struct strmbase_pin *This, int iPosition, AM_MEDIA_TYPE *pmt)
{ {
TransformFilter *pTransform = impl_from_source_IPin(&This->IPin_iface); TransformFilter *pTransform = impl_from_source_IPin(&This->IPin_iface);
...@@ -166,14 +166,14 @@ static const struct strmbase_filter_ops filter_ops = ...@@ -166,14 +166,14 @@ static const struct strmbase_filter_ops filter_ops =
static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = static const BaseInputPinFuncTable tf_input_BaseInputFuncTable =
{ {
.base.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.base.pfnGetMediaType = BasePinImpl_GetMediaType, .base.pin_get_media_type = strmbase_pin_get_media_type,
.pfnReceive = TransformFilter_Input_Receive, .pfnReceive = TransformFilter_Input_Receive,
}; };
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = TransformFilter_Output_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideBufferSize = TransformFilter_Output_DecideBufferSize, .pfnDecideBufferSize = TransformFilter_Output_DecideBufferSize,
.pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator,
......
dlls/winegstreamer/gstdemux.c
View file @ f46fe6d3
...@@ -1250,7 +1250,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE ...@@ -1250,7 +1250,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE
static const BasePinFuncTable sink_ops = static const BasePinFuncTable sink_ops =
{ {
.pin_query_accept = sink_query_accept, .pin_query_accept = sink_query_accept,
.pfnGetMediaType = BasePinImpl_GetMediaType, .pin_get_media_type = strmbase_pin_get_media_type,
}; };
static BOOL gstdecoder_init_gst(struct gstdemux *filter) static BOOL gstdecoder_init_gst(struct gstdemux *filter)
...@@ -1799,7 +1799,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP ...@@ -1799,7 +1799,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP
return S_OK; return S_OK;
} }
static HRESULT WINAPI GSTOutPin_GetMediaType(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt)
{ {
struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface); struct gstdemux_source *This = impl_source_from_IPin(&iface->IPin_iface);
...@@ -1907,7 +1907,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { ...@@ -1907,7 +1907,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = {
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = GSTOutPin_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideBufferSize = GSTOutPin_DecideBufferSize, .pfnDecideBufferSize = GSTOutPin_DecideBufferSize,
.pfnDecideAllocator = GSTOutPin_DecideAllocator, .pfnDecideAllocator = GSTOutPin_DecideAllocator,
...@@ -2316,7 +2316,7 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A ...@@ -2316,7 +2316,7 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A
static const BasePinFuncTable wave_parser_sink_ops = static const BasePinFuncTable wave_parser_sink_ops =
{ {
.pin_query_accept = wave_parser_sink_query_accept, .pin_query_accept = wave_parser_sink_query_accept,
.pfnGetMediaType = BasePinImpl_GetMediaType, .pin_get_media_type = strmbase_pin_get_media_type,
}; };
static BOOL wave_parser_init_gst(struct gstdemux *filter) static BOOL wave_parser_init_gst(struct gstdemux *filter)
...@@ -2422,7 +2422,7 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const ...@@ -2422,7 +2422,7 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const
static const BasePinFuncTable avi_splitter_sink_ops = static const BasePinFuncTable avi_splitter_sink_ops =
{ {
.pin_query_accept = avi_splitter_sink_query_accept, .pin_query_accept = avi_splitter_sink_query_accept,
.pfnGetMediaType = BasePinImpl_GetMediaType, .pin_get_media_type = strmbase_pin_get_media_type,
}; };
static BOOL avi_splitter_init_gst(struct gstdemux *filter) static BOOL avi_splitter_init_gst(struct gstdemux *filter)
...@@ -2534,7 +2534,7 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const ...@@ -2534,7 +2534,7 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const
static const BasePinFuncTable mpeg_splitter_sink_ops = static const BasePinFuncTable mpeg_splitter_sink_ops =
{ {
.pin_query_accept = mpeg_splitter_sink_query_accept, .pin_query_accept = mpeg_splitter_sink_query_accept,
.pfnGetMediaType = BasePinImpl_GetMediaType, .pin_get_media_type = strmbase_pin_get_media_type,
}; };
static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static BOOL mpeg_splitter_init_gst(struct gstdemux *filter)
......
dlls/wineqtdecoder/qtsplitter.c
View file @ f46fe6d3
...@@ -305,7 +305,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE ...@@ -305,7 +305,7 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE
static const BasePinFuncTable sink_ops = static const BasePinFuncTable sink_ops =
{ {
.pin_query_accept = sink_query_accept, .pin_query_accept = sink_query_accept,
.pfnGetMediaType = BasePinImpl_GetMediaType, .pin_get_media_type = strmbase_pin_get_media_type,
}; };
IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr)
...@@ -1295,7 +1295,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP ...@@ -1295,7 +1295,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP
return S_OK; return S_OK;
} }
static HRESULT WINAPI QTOutPin_GetMediaType(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt) static HRESULT source_get_media_type(struct strmbase_pin *iface, int iPosition, AM_MEDIA_TYPE *pmt)
{ {
QTOutPin *This = impl_sink_from_strmbase_pin(iface); QTOutPin *This = impl_sink_from_strmbase_pin(iface);
...@@ -1407,7 +1407,7 @@ static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = { ...@@ -1407,7 +1407,7 @@ static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = {
static const struct strmbase_source_ops source_ops = static const struct strmbase_source_ops source_ops =
{ {
.base.pin_query_accept = source_query_accept, .base.pin_query_accept = source_query_accept,
.base.pfnGetMediaType = QTOutPin_GetMediaType, .base.pin_get_media_type = source_get_media_type,
.pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection,
.pfnDecideBufferSize = QTOutPin_DecideBufferSize, .pfnDecideBufferSize = QTOutPin_DecideBufferSize,
.pfnDecideAllocator = QTOutPin_DecideAllocator, .pfnDecideAllocator = QTOutPin_DecideAllocator,
......
include/wine/strmbase.h
View file @ f46fe6d3
...@@ -42,14 +42,11 @@ struct strmbase_pin ...@@ -42,14 +42,11 @@ struct strmbase_pin
const struct BasePinFuncTable* pFuncsTable; const struct BasePinFuncTable* pFuncsTable;
}; };
typedef LONG (WINAPI *BasePin_GetMediaTypeVersion)(struct strmbase_pin *pin);
typedef HRESULT (WINAPI *BasePin_GetMediaType)(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt);
typedef struct BasePinFuncTable { typedef struct BasePinFuncTable {
/* Required for QueryAccept(), Connect(), ReceiveConnection(). */ /* Required for QueryAccept(), Connect(), ReceiveConnection(). */
HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt); HRESULT (*pin_query_accept)(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt);
/* Required for EnumMediaTypes(). */ /* Required for EnumMediaTypes(). */
BasePin_GetMediaType pfnGetMediaType; HRESULT (*pin_get_media_type)(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt);
} BasePinFuncTable; } BasePinFuncTable;
struct strmbase_source struct strmbase_source
...@@ -98,7 +95,7 @@ typedef struct BaseInputPinFuncTable { ...@@ -98,7 +95,7 @@ typedef struct BaseInputPinFuncTable {
} BaseInputPinFuncTable; } BaseInputPinFuncTable;
/* Base Pin */ /* Base Pin */
HRESULT WINAPI BasePinImpl_GetMediaType(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt); HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, int index, AM_MEDIA_TYPE *mt);
LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin); LONG WINAPI BasePinImpl_GetMediaTypeVersion(struct strmbase_pin *pin);
ULONG WINAPI BasePinImpl_AddRef(IPin *iface); ULONG WINAPI BasePinImpl_AddRef(IPin *iface);
ULONG WINAPI BasePinImpl_Release(IPin *iface); ULONG WINAPI BasePinImpl_Release(IPin *iface);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment