DirectShow: Sanitize DirectShowMediaType

The DirectShowMediaType is now a thin data wrapper around AM_MEDIA_TYPE
and will for the most look and work the same way, with the exception
that it cleans up after itself. All utility functions are now static,
except clear() which, for convenience, is also provided as a non-static
member function.

In addition to the changes mentioned above, duplicated methods were
removed, conversion for ARGB32 was added, and an attempt to make
the usage of AM_MEDIA_TYPE and DirectShowMediaType was made more
consistent.

Change-Id: Iad32fb8eeabd9d4183e9bd10426cac3963e5d99a
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/directshow/helpers/directshowpin.h b/src/plugins/directshow/helpers/directshowpin.h
index 823223956..b8207abae 100644
--- a/src/plugins/directshow/helpers/directshowpin.h
+++ b/src/plugins/directshow/helpers/directshowpin.h
@@ -55,9 +55,9 @@ public:
     QString name() const { return m_name; }
     bool isConnected() const { return m_peerPin != NULL; }
 
-    virtual bool isMediaTypeSupported(const DirectShowMediaType *type) = 0;
+    virtual bool isMediaTypeSupported(const AM_MEDIA_TYPE *type) = 0;
     virtual QList<DirectShowMediaType> supportedMediaTypes();
-    virtual bool setMediaType(const DirectShowMediaType *type);
+    virtual bool setMediaType(const AM_MEDIA_TYPE *type);
 
     virtual HRESULT completeConnection(IPin *pin);
     virtual HRESULT connectionEnded();
@@ -107,8 +107,8 @@ protected:
 
 private:
     Q_DISABLE_COPY(DirectShowPin)
-    HRESULT tryMediaTypes(IPin *pin, const DirectShowMediaType *type, IEnumMediaTypes *enumMediaTypes);
-    HRESULT tryConnect(IPin *pin, const DirectShowMediaType *type);
+    HRESULT tryMediaTypes(IPin *pin, const AM_MEDIA_TYPE *type, IEnumMediaTypes *enumMediaTypes);
+    HRESULT tryConnect(IPin *pin, const AM_MEDIA_TYPE *type);
 };