mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 22:28:30 +00:00
winegstreamer: Use strmbase_dump_media_type() where appropriate.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
e1150b8632
commit
6c8cb0abac
|
@ -35,9 +35,6 @@
|
||||||
|
|
||||||
#define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000)
|
#define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000)
|
||||||
|
|
||||||
/* enum media */
|
|
||||||
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt);
|
|
||||||
|
|
||||||
IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN;
|
IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN;
|
||||||
IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN;
|
IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN;
|
||||||
IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr);
|
IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr);
|
||||||
|
|
|
@ -1976,7 +1976,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
|
|
||||||
TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt);
|
TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt);
|
||||||
dump_AM_MEDIA_TYPE(pmt);
|
strmbase_dump_media_type(pmt);
|
||||||
|
|
||||||
mark_wine_thread();
|
mark_wine_thread();
|
||||||
|
|
||||||
|
|
|
@ -509,7 +509,6 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A
|
||||||
{
|
{
|
||||||
GstTfImpl *This = (GstTfImpl*)iface;
|
GstTfImpl *This = (GstTfImpl*)iface;
|
||||||
TRACE("%p %p\n", This, amt);
|
TRACE("%p %p\n", This, amt);
|
||||||
dump_AM_MEDIA_TYPE(amt);
|
|
||||||
|
|
||||||
if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) &&
|
if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) &&
|
||||||
!IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) ||
|
!IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) ||
|
||||||
|
@ -649,7 +648,6 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A
|
||||||
{
|
{
|
||||||
GstTfImpl *This = (GstTfImpl*)iface;
|
GstTfImpl *This = (GstTfImpl*)iface;
|
||||||
TRACE("%p %p\n", This, amt);
|
TRACE("%p %p\n", This, amt);
|
||||||
dump_AM_MEDIA_TYPE(amt);
|
|
||||||
|
|
||||||
if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) ||
|
if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) ||
|
||||||
(!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) &&
|
(!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) &&
|
||||||
|
@ -885,7 +883,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface
|
||||||
{
|
{
|
||||||
GstTfImpl *This = (GstTfImpl*)iface;
|
GstTfImpl *This = (GstTfImpl*)iface;
|
||||||
TRACE("%p %p\n", This, amt);
|
TRACE("%p %p\n", This, amt);
|
||||||
dump_AM_MEDIA_TYPE(amt);
|
|
||||||
|
|
||||||
if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) ||
|
if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) ||
|
||||||
!IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) ||
|
!IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) ||
|
||||||
|
|
|
@ -412,15 +412,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* GStreamer common functions */
|
|
||||||
|
|
||||||
void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt)
|
|
||||||
{
|
|
||||||
if (!pmt)
|
|
||||||
return;
|
|
||||||
TRACE("\t%s\n\t%s\n\t...\n\t%s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype), debugstr_guid(&pmt->formattype));
|
|
||||||
}
|
|
||||||
|
|
||||||
static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx)
|
static BOOL CALLBACK init_gstreamer_proc(INIT_ONCE *once, void *param, void **ctx)
|
||||||
{
|
{
|
||||||
BOOL *status = param;
|
BOOL *status = param;
|
||||||
|
|
Loading…
Reference in a new issue