[PATCH v2 06/10] mfplat: Only convert MEDIASUBTYPE for the formats that need it.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/mfplat/mediatype.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
index 437e5aba869..c3798adee5a 100644
--- a/dlls/mfplat/mediatype.c
+++ b/dlls/mfplat/mediatype.c
@@ -3601,30 +3601,33 @@ static HRESULT mf_get_stride_for_bitmap_info_header(DWORD fourcc, const BITMAPIN
 static const GUID * get_mf_subtype_for_am_subtype(const GUID *subtype)
 {
     static const GUID null;
+    GUID base;

+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_A2R10G10B10))
+        return &MFVideoFormat_A2R10G10B10;
+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_ARGB32))
+        return &MFVideoFormat_ARGB32;
+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB8))
+        return &MFVideoFormat_RGB8;
+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB555))
+        return &MFVideoFormat_RGB555;
+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB565))
+        return &MFVideoFormat_RGB565;
+    if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB24))
+        return &MFVideoFormat_RGB24;
     if (IsEqualGUID(subtype, &MEDIASUBTYPE_RGB32))
         return &MFVideoFormat_RGB32;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_ARGB32))
-        return &MFVideoFormat_ARGB32;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_I420))
-        return &MFVideoFormat_I420;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_AYUV))
-        return &MFVideoFormat_AYUV;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YV12))
-        return &MFVideoFormat_YV12;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YUY2))
-        return &MFVideoFormat_YUY2;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_UYVY))
-        return &MFVideoFormat_UYVY;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_YVYU))
-        return &MFVideoFormat_YVYU;
-    else if (IsEqualGUID(subtype, &MEDIASUBTYPE_NV12))
-        return &MFVideoFormat_NV12;
-    else
+
+    base = *subtype;
+    base.Data1 = 0;
+
+    if (memcmp(&base, &MFVideoFormat_Base, sizeof(base)))
     {
         FIXME("Unknown subtype %s.\n", debugstr_guid(subtype));
         return &null;
     }
+
+    return subtype;
 }

/***********************************************************************