[PATCH 5/5] winegstreamer: Use strmbase_dump_media_type() where appropriate.

Zebediah Figura z.figura12 at gmail.com
Sat Oct 5 19:18:53 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/winegstreamer/gst_private.h | 3 ---
 dlls/winegstreamer/gstdemux.c    | 2 +-
 dlls/winegstreamer/gsttffilter.c | 3 ---
 dlls/winegstreamer/main.c        | 9 ---------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 596724cf261..122e4c1037e 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -35,9 +35,6 @@
 
 #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 mpeg_splitter_create(IUnknown *outer, HRESULT *phr) DECLSPEC_HIDDEN;
 IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr);
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 4a685b1bd5a..f20455c2be5 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -1976,7 +1976,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
     HRESULT hr = S_OK;
 
     TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt);
-    dump_AM_MEDIA_TYPE(pmt);
+    strmbase_dump_media_type(pmt);
 
     mark_wine_thread();
 
diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c
index 1a40ec68568..8619cc6b3fb 100644
--- a/dlls/winegstreamer/gsttffilter.c
+++ b/dlls/winegstreamer/gsttffilter.c
@@ -509,7 +509,6 @@ static HRESULT WINAPI Gstreamer_Mp3_QueryConnect(TransformFilter *iface, const A
 {
     GstTfImpl *This = (GstTfImpl*)iface;
     TRACE("%p %p\n", This, amt);
-    dump_AM_MEDIA_TYPE(amt);
 
     if ( (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) &&
           !IsEqualGUID(&amt->majortype, &MEDIATYPE_Stream)) ||
@@ -649,7 +648,6 @@ static HRESULT WINAPI Gstreamer_YUV_QueryConnect(TransformFilter *iface, const A
 {
     GstTfImpl *This = (GstTfImpl*)iface;
     TRACE("%p %p\n", This, amt);
-    dump_AM_MEDIA_TYPE(amt);
 
     if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Video) ||
         (!IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo) &&
@@ -885,7 +883,6 @@ static HRESULT WINAPI Gstreamer_AudioConvert_QueryConnect(TransformFilter *iface
 {
     GstTfImpl *This = (GstTfImpl*)iface;
     TRACE("%p %p\n", This, amt);
-    dump_AM_MEDIA_TYPE(amt);
 
     if (!IsEqualGUID(&amt->majortype, &MEDIATYPE_Audio) ||
         !IsEqualGUID(&amt->subtype, &MEDIASUBTYPE_PCM) ||
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index 5a8e05e8872..379f54ab4ec 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -412,15 +412,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     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)
 {
     BOOL *status = param;
-- 
2.23.0




More information about the wine-devel mailing list