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

qedit/samplegrabber: Rename the "mtype" field to "filter_mt". 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-02-06 16:49:13 -06:00 committed by Alexandre Julliard
parent 94111ea281
commit d11b31fdbe
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/qedit/samplegrabber.c
View File

@ -43,7 +43,7 @@ typedef struct _SG_Impl {
IUnknown *seekthru_unk; IUnknown *seekthru_unk;
struct strmbase_sink sink; struct strmbase_sink sink;
AM_MEDIA_TYPE mtype; AM_MEDIA_TYPE filter_mt;
IMemInputPin IMemInputPin_iface; IMemInputPin IMemInputPin_iface;
IMemAllocator *allocator; IMemAllocator *allocator;
@ -84,7 +84,7 @@ static void SampleGrabber_cleanup(SG_Impl *This)
IMemAllocator_Release(This->allocator); IMemAllocator_Release(This->allocator);
if (This->grabberIface) if (This->grabberIface)
ISampleGrabberCB_Release(This->grabberIface); ISampleGrabberCB_Release(This->grabberIface);
CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This->filter_mt.pbFormat);
CoTaskMemFree(This->bufferData); CoTaskMemFree(This->bufferData);
if(This->seekthru_unk) if(This->seekthru_unk)
IUnknown_Release(This->seekthru_unk); IUnknown_Release(This->seekthru_unk);
@ -236,15 +236,15 @@ SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_
debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), debugstr_guid(&type->majortype), debugstr_guid(&type->subtype),
type->lSampleSize, type->lSampleSize,
debugstr_guid(&type->formattype), type->cbFormat); debugstr_guid(&type->formattype), type->cbFormat);
CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This->filter_mt.pbFormat);
This->mtype = *type; This->filter_mt = *type;
This->mtype.pUnk = NULL; This->filter_mt.pUnk = NULL;
if (type->cbFormat) { if (type->cbFormat) {
This->mtype.pbFormat = CoTaskMemAlloc(type->cbFormat); This->filter_mt.pbFormat = CoTaskMemAlloc(type->cbFormat);
CopyMemory(This->mtype.pbFormat, type->pbFormat, type->cbFormat); CopyMemory(This->filter_mt.pbFormat, type->pbFormat, type->cbFormat);
} }
else else
This->mtype.pbFormat = NULL; This->filter_mt.pbFormat = NULL;
return S_OK; return S_OK;
} }
@ -258,10 +258,10 @@ SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MED
return E_POINTER; return E_POINTER;
if (!This->sink.pin.peer) if (!This->sink.pin.peer)
return VFW_E_NOT_CONNECTED; return VFW_E_NOT_CONNECTED;
*type = This->mtype; *type = This->filter_mt;
if (type->cbFormat) { if (type->cbFormat) {
type->pbFormat = CoTaskMemAlloc(type->cbFormat); type->pbFormat = CoTaskMemAlloc(type->cbFormat);
CopyMemory(type->pbFormat, This->mtype.pbFormat, type->cbFormat); CopyMemory(type->pbFormat, This->filter_mt.pbFormat, type->cbFormat);
} }
return S_OK; return S_OK;
} }
@ -500,7 +500,7 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface,
if (!index) if (!index)
{ {
CopyMediaType(mt, &filter->mtype); CopyMediaType(mt, &filter->filter_mt);
return S_OK; return S_OK;
} }
return VFW_S_NO_MORE_ITEMS; return VFW_S_NO_MORE_ITEMS;
@ -515,20 +515,20 @@ static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface,
&& !IsEqualGUID(&mt->formattype, &GUID_NULL) && !mt->pbFormat) && !IsEqualGUID(&mt->formattype, &GUID_NULL) && !mt->pbFormat)
return VFW_E_INVALIDMEDIATYPE; return VFW_E_INVALIDMEDIATYPE;
if (!IsEqualGUID(&filter->mtype.majortype, &GUID_NULL) if (!IsEqualGUID(&filter->filter_mt.majortype, &GUID_NULL)
&& !IsEqualGUID(&filter->mtype.majortype, &mt->majortype)) && !IsEqualGUID(&filter->filter_mt.majortype, &mt->majortype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
if (!IsEqualGUID(&filter->mtype.subtype, &GUID_NULL) if (!IsEqualGUID(&filter->filter_mt.subtype, &GUID_NULL)
&& !IsEqualGUID(&filter->mtype.subtype, &mt->subtype)) && !IsEqualGUID(&filter->filter_mt.subtype, &mt->subtype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
if (!IsEqualGUID(&filter->mtype.formattype, &GUID_NULL) if (!IsEqualGUID(&filter->filter_mt.formattype, &GUID_NULL)
&& !IsEqualGUID(&filter->mtype.formattype, &mt->formattype)) && !IsEqualGUID(&filter->filter_mt.formattype, &mt->formattype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
FreeMediaType(&filter->mtype); FreeMediaType(&filter->filter_mt);
CopyMediaType(&filter->mtype, mt); CopyMediaType(&filter->filter_mt, mt);
return S_OK; return S_OK;
} }
@ -568,7 +568,7 @@ static HRESULT sample_grabber_source_get_media_type(struct strmbase_pin *iface,
if (!index) if (!index)
{ {
CopyMediaType(mt, &filter->mtype); CopyMediaType(mt, &filter->filter_mt);
return S_OK; return S_OK;
} }
return VFW_S_NO_MORE_ITEMS; return VFW_S_NO_MORE_ITEMS;
@ -580,13 +580,13 @@ static HRESULT WINAPI sample_grabber_source_DecideAllocator(struct strmbase_sour
SG_Impl *filter = impl_from_source_pin(&iface->pin); SG_Impl *filter = impl_from_source_pin(&iface->pin);
const AM_MEDIA_TYPE *mt = &iface->pin.mt; const AM_MEDIA_TYPE *mt = &iface->pin.mt;
if (!IsEqualGUID(&mt->majortype, &filter->mtype.majortype)) if (!IsEqualGUID(&mt->majortype, &filter->filter_mt.majortype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
if (!IsEqualGUID(&mt->subtype, &filter->mtype.subtype)) if (!IsEqualGUID(&mt->subtype, &filter->filter_mt.subtype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
if (!IsEqualGUID(&mt->formattype, &FORMAT_None) if (!IsEqualGUID(&mt->formattype, &FORMAT_None)
&& !IsEqualGUID(&mt->formattype, &GUID_NULL) && !IsEqualGUID(&mt->formattype, &GUID_NULL)
&& !IsEqualGUID(&mt->formattype, &filter->mtype.formattype)) && !IsEqualGUID(&mt->formattype, &filter->filter_mt.formattype))
return VFW_E_TYPE_NOT_ACCEPTED; return VFW_E_TYPE_NOT_ACCEPTED;
if (!IsEqualGUID(&mt->formattype, &FORMAT_None) if (!IsEqualGUID(&mt->formattype, &FORMAT_None)
&& !IsEqualGUID(&mt->formattype, &GUID_NULL) && !IsEqualGUID(&mt->formattype, &GUID_NULL)