Updated mfplat-streaming-support patchset

2025-01-28 22:04:43 -08:00 · 2020-11-10 16:42:53 +11:00 · 2020-11-10 16:42:53 +11:00 · 41c7c741d7
commit 41c7c741d7
parent 009f571ba1
49 changed files with 817 additions and 623 deletions
--- a/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch
+++ b/patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch
@ -0,0 +1,164 @@
+From 71055ca3dfc664a37a5ecf428ba75e89648acc89 Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Mon, 2 Nov 2020 09:56:54 -0600
+Subject: [PATCH 01/45] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames
+ stub.
+
+Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
+---
+ dlls/winegstreamer/media_source.c | 111 ++++++++++++++++++++++++++++++
+ 1 file changed, 111 insertions(+)
+
+diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
+index 66bdf64a669..828958e47e2 100644
+--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
+@@ -91,6 +91,8 @@ struct source_async_command
+ struct media_source
+ {
+     IMFMediaSource IMFMediaSource_iface;
+    IMFGetService IMFGetService_iface;
+    IMFSeekInfo IMFSeekInfo_iface;
+     IMFAsyncCallback async_commands_callback;
+     LONG ref;
+     DWORD async_commands_queue;
+@@ -123,6 +125,16 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac
+     return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface);
+ }
+ 
+static inline struct media_source *impl_from_IMFGetService(IMFGetService *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFGetService_iface);
+}
+
+static inline struct media_source *impl_from_IMFSeekInfo(IMFSeekInfo *iface)
+{
+    return CONTAINING_RECORD(iface, struct media_source, IMFSeekInfo_iface);
+}
+
+ static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface)
+ {
+     return CONTAINING_RECORD(iface, struct media_source, async_commands_callback);
+@@ -956,6 +968,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID
+     {
+         *out = &source->IMFMediaSource_iface;
+     }
+    else if(IsEqualIID(riid, &IID_IMFGetService))
+    {
+        *out = &source->IMFGetService_iface;
+    }
+     else
+     {
+         FIXME("(%s, %p)\n", debugstr_guid(riid), out);
+@@ -1185,6 +1201,99 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
+     media_source_Shutdown,
+ };
+ 
+static HRESULT WINAPI source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj);
+}
+
+static ULONG WINAPI source_get_service_AddRef(IMFGetService *iface)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI source_get_service_Release(IMFGetService *iface)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI source_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFGetService(iface);
+
+    TRACE("(%p)->(%s, %s, %p)\n", source, debugstr_guid(service), debugstr_guid(riid), obj);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        return MF_E_SHUTDOWN;
+
+    *obj = NULL;
+
+    if (IsEqualIID(service, &MF_SCRUBBING_SERVICE))
+    {
+        if (IsEqualIID(riid, &IID_IMFSeekInfo))
+        {
+            *obj = &source->IMFSeekInfo_iface;
+        }
+    }
+
+    if (*obj)
+        IUnknown_AddRef((IUnknown*) *obj);
+
+    return *obj ? S_OK : E_NOINTERFACE;
+}
+
+static const IMFGetServiceVtbl IMFGetService_vtbl =
+{
+    source_get_service_QueryInterface,
+    source_get_service_AddRef,
+    source_get_service_Release,
+    source_get_service_GetService,
+};
+
+static HRESULT WINAPI source_seek_info_QueryInterface(IMFSeekInfo *iface, REFIID riid, void **obj)
+{
+    struct media_source *source = impl_from_IMFSeekInfo(iface);
+    return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj);
+}
+
+static ULONG WINAPI source_seek_info_AddRef(IMFSeekInfo *iface)
+{
+    struct media_source *source = impl_from_IMFSeekInfo(iface);
+    return IMFMediaSource_AddRef(&source->IMFMediaSource_iface);
+}
+
+static ULONG WINAPI source_seek_info_Release(IMFSeekInfo *iface)
+{
+    struct media_source *source = impl_from_IMFSeekInfo(iface);
+    return IMFMediaSource_Release(&source->IMFMediaSource_iface);
+}
+
+static HRESULT WINAPI source_seek_info_GetNearestKeyFrames(IMFSeekInfo *iface, const GUID *format,
+        const PROPVARIANT *position, PROPVARIANT *prev_frame, PROPVARIANT *next_frame)
+{
+    struct media_source *source = impl_from_IMFSeekInfo(iface);
+
+    FIXME("(%p)->(%s, %p, %p, %p) - semi-stub\n", source, debugstr_guid(format), position, prev_frame, next_frame);
+
+    if (source->state == SOURCE_SHUTDOWN)
+        return MF_E_SHUTDOWN;
+
+    PropVariantCopy(prev_frame, position);
+    PropVariantCopy(next_frame, position);
+
+    return S_OK;
+}
+
+static const IMFSeekInfoVtbl IMFSeekInfo_vtbl =
+{
+    source_seek_info_QueryInterface,
+    source_seek_info_AddRef,
+    source_seek_info_Release,
+    source_seek_info_GetNearestKeyFrames,
+};
+
+ static void stream_added(GstElement *element, GstPad *pad, gpointer user)
+ {
+     struct media_source *source = user;
+@@ -1256,6 +1365,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+     }
+ 
+     object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl;
+    object->IMFGetService_iface.lpVtbl = &IMFGetService_vtbl;
+    object->IMFSeekInfo_iface.lpVtbl = &IMFSeekInfo_vtbl;
+     object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl;
+     object->ref = 1;
+     object->byte_stream = bytestream;
+-- 
+2.28.0
+
--- a/patches/mfplat-streaming-support/0002-winegstreamer-Fixup-raw-audio-caps-to-be-compatible-.patch
+++ b/patches/mfplat-streaming-support/0002-winegstreamer-Fixup-raw-audio-caps-to-be-compatible-.patch
@ -0,0 +1,122 @@
+From 0e097a430b44aaabdc51d779c81a5ac82aa730db Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Fri, 6 Nov 2020 10:06:23 -0600
+Subject: [PATCH 02/45] winegstreamer: Fixup raw audio caps to be compatible
+ with IMFMediaType.
+
+Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
+---
+ dlls/winegstreamer/gst_private.h  |  1 +
+ dlls/winegstreamer/media_source.c |  7 +++-
+ dlls/winegstreamer/mfplat.c       | 57 +++++++++++++++++++++++++++++++
+ 3 files changed, 64 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
+index 28e424439d8..75fc7dc90a8 100644
+--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
+@@ -78,6 +78,7 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN;
+ extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN;
+ 
+ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
+GstCaps *make_mf_compatible_caps(GstCaps *caps) DECLSPEC_HIDDEN;
+ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN;
+ GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN;
+ IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN;
+diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
+index 828958e47e2..272dbfbfca6 100644
+--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
+@@ -869,15 +869,20 @@ fail:
+ 
+ static HRESULT media_stream_init_desc(struct media_stream *stream)
+ {
+-    GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src);
+    GstCaps *base_caps = gst_pad_get_current_caps(stream->their_src);
+     IMFMediaTypeHandler *type_handler;
+     IMFMediaType **stream_types = NULL;
+     IMFMediaType *stream_type = NULL;
+    GstCaps *current_caps = make_mf_compatible_caps(base_caps);
+     DWORD type_count = 0;
+     const gchar *major_type;
+     unsigned int i;
+     HRESULT hr;
+ 
+    gst_caps_unref(base_caps);
+    if (!current_caps)
+        return E_FAIL;
+
+     major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0));
+ 
+     if (!strcmp(major_type, "video/x-raw"))
+diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
+index 3d224a5accc..7a877c2a416 100644
+--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
+@@ -602,6 +602,63 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
+     return media_type;
+ }
+ 
+GstCaps *make_mf_compatible_caps(GstCaps *caps)
+{
+    GstCaps *ret;
+    IMFMediaType *media_type;
+    GstStructure *structure;
+    const char *mime_type;
+
+    if (gst_caps_get_size(caps) != 1)
+        return NULL;
+
+    /* Optimization: Don't copy caps if no transformation is needed */
+    if ((media_type = mf_media_type_from_caps(caps)))
+    {
+        IMFMediaType_Release(media_type);
+        return gst_caps_ref(caps);
+    }
+
+    ret = gst_caps_copy(caps);
+    structure = gst_caps_get_structure(ret, 0);
+    mime_type = gst_structure_get_name(structure);
+
+    if (!strcmp(mime_type, "audio/x-raw"))
+    {
+        const char *format;
+        if ((format = gst_structure_get_string(structure, "format")))
+        {
+            char type;
+            unsigned int bits_per_sample;
+            char endian[2];
+            char new_format[6];
+
+            if (strlen(format) <= 5 && (sscanf(format, "%c%u%2c", &type, &bits_per_sample, endian) >= 2))
+            {
+                if (type == 'U' || type == 'S')
+                    type = bits_per_sample == 8 ? 'U' : 'S';
+
+                if (endian[0] == 'B')
+                    endian[0] = 'L';
+
+                sprintf(new_format, "%c%u%.2s", type, bits_per_sample, bits_per_sample > 8 ? endian : 0);
+                gst_caps_set_simple(caps, "format", G_TYPE_STRING, new_format, NULL);
+            }
+        }
+    }
+
+    if ((media_type = mf_media_type_from_caps(ret)))
+        IMFMediaType_Release(media_type);
+
+    if (!media_type)
+    {
+        gst_caps_unref(ret);
+        return NULL;
+    }
+
+    return ret;
+}
+
+ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+ {
+     GUID major_type;
+-- 
+2.28.0
+
--- a/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch
+++ b/patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch
@ -0,0 +1,45 @@
+From 20c483cf8d0b9ca634a325239006b41b67cce3eb Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Mon, 2 Nov 2020 10:18:27 -0600
+Subject: [PATCH 03/45] winegstreamer: Set MF_PD_MIME_TYPE on source's
+ presentation descriptor.
+
+Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
+---
+ dlls/winegstreamer/media_source.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
+index 272dbfbfca6..36f995cc6ef 100644
+--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
+@@ -1351,6 +1351,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+ 
+     struct media_source *object = heap_alloc_zero(sizeof(*object));
+     IMFStreamDescriptor **descriptors = NULL;
+    IMFAttributes *byte_stream_attributes;
+     gint64 total_pres_time = 0;
+     DWORD bytestream_caps;
+     unsigned int i;
+@@ -1493,6 +1494,18 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+     if (object->stream_count)
+         IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100);
+ 
+    if (SUCCEEDED(IMFByteStream_QueryInterface(object->byte_stream, &IID_IMFAttributes, (void **)&byte_stream_attributes)))
+    {
+        WCHAR *mimeW = NULL;
+        DWORD length;
+        if (SUCCEEDED(IMFAttributes_GetAllocatedString(byte_stream_attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length)))
+        {
+            IMFPresentationDescriptor_SetString(object->pres_desc, &MF_PD_MIME_TYPE, mimeW);
+            CoTaskMemFree(mimeW);
+        }
+        IMFAttributes_Release(byte_stream_attributes);
+    }
+
+     object->state = SOURCE_STOPPED;
+ 
+     *out_media_source = object;
+-- 
+2.28.0
+
--- a/patches/mfplat-streaming-support/0004-mf-Unconditionally-deliver-NULL-EOS-samples.patch
+++ b/patches/mfplat-streaming-support/0004-mf-Unconditionally-deliver-NULL-EOS-samples.patch
@ -1,7 +1,7 @@
-From 6f5a552ebbe6bcafed0b92de60c7104fb1021c64 Mon Sep 17 00:00:00 2001
+From 21b3adc827428ea014e2d02ef955efeffd965999 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 14 Oct 2020 11:07:05 -0500
-Subject: [PATCH] mf: Unconditionally deliver NULL (EOS) samples.
+Subject: [PATCH 04/45] mf: Unconditionally deliver NULL (EOS) samples.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
--- a/patches/mfplat-streaming-support/0005-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch
+++ b/patches/mfplat-streaming-support/0005-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch
@ -1,33 +1,19 @@
-From aefabd1b2c8859c0fdf2ecbdf03cf76204e667a0 Mon Sep 17 00:00:00 2001
+From 2f4b30a65e449223c524453509ea0be5d11f8b9e Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 15 Sep 2020 14:25:26 -0500
-Subject: [PATCH] winegstreamer: Insert parser into pipeline to rectify type
- differences.
+Subject: [PATCH 05/45] winegstreamer: Insert parser into pipeline to rectify
+ type differences.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/winegstreamer/gst_private.h  |   1 +
- dlls/winegstreamer/media_source.c | 111 ++++++++++++++++++++++++++++--
- dlls/winegstreamer/mfplat.c       |  22 ++++++
- 3 files changed, 130 insertions(+), 4 deletions(-)
+ dlls/winegstreamer/media_source.c | 95 ++++++++++++++++++++++++++++++-
+ 1 file changed, 92 insertions(+), 3 deletions(-)

-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 28e424439d8..75fc7dc90a8 100644
--- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -78,6 +78,7 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN;
- extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) DECLSPEC_HIDDEN;
- 
- HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
-+GstCaps *make_mf_compatible_caps(GstCaps *caps) DECLSPEC_HIDDEN;
- IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN;
- GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN;
- IMFSample *mf_sample_from_gst_buffer(GstBuffer *in) DECLSPEC_HIDDEN;
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index ef694bf194a..d25e34dec68 100644
+index 36f995cc6ef..ea299c124dd 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -752,8 +752,17 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
+@@ -769,8 +769,17 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
     media_stream_RequestSample
 };
 
@ -47,7 +33,7 @@ index ef694bf194a..d25e34dec68 100644
 static HRESULT media_stream_connect_to_sink(struct media_stream *stream)
 {
     GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL);
-@@ -793,7 +802,68 @@ static HRESULT media_stream_connect_to_sink(struct media_stream *stream)
+@@ -810,7 +819,68 @@ static HRESULT media_stream_connect_to_sink(struct media_stream *stream)
     }
     else
     {
@ -117,38 +103,8 @@ index ef694bf194a..d25e34dec68 100644
     }
 
     if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK)
-@@ -903,7 +973,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-                 goto done;
-         }
-     }
-    else
-+    else if (!strcmp(major_type, "audio/x-raw"))
-     {
-         stream_type = mf_media_type_from_caps(current_caps);
-         if (stream_type)
-@@ -912,6 +982,20 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-             type_count = 1;
-         }
-     }
-+    else
-+    {
-+        GstCaps *compatible_caps = make_mf_compatible_caps(current_caps);
-+        if (compatible_caps)
-+        {
-+            stream_type = mf_media_type_from_caps(compatible_caps);
-+            gst_caps_unref(compatible_caps);
-+            if (stream_type)
-+            {
-+                stream_types = &stream_type;
-+                type_count = 1;
-+            }
-+        }
-+    }
- 
-     if (!type_count)
-     {
-@@ -1178,6 +1262,23 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
-     media_source_Shutdown,
+@@ -1299,6 +1369,23 @@ static const IMFSeekInfoVtbl IMFSeekInfo_vtbl =
+     source_seek_info_GetNearestKeyFrames,
 };
 
 +/* If this callback is extended to use any significant win32 APIs, a wrapper function
@ -171,7 +127,7 @@ index ef694bf194a..d25e34dec68 100644
 static void stream_added(GstElement *element, GstPad *pad, gpointer user)
 {
     struct media_source *source = user;
-@@ -1283,6 +1384,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1418,6 +1505,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
 
     gst_bin_add(GST_BIN(object->container), object->decodebin);
 
@ -180,39 +136,6 @@ index ef694bf194a..d25e34dec68 100644
     g_signal_connect(object->decodebin, "pad-added", G_CALLBACK(mf_src_stream_added_wrapper), object);
     g_signal_connect(object->decodebin, "pad-removed", G_CALLBACK(mf_src_stream_removed_wrapper), object);
     g_signal_connect(object->decodebin, "no-more-pads", G_CALLBACK(mf_src_no_more_pads_wrapper), object);
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 908f3d83ef9..bed5d0cc31c 100644
--- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -602,6 +602,28 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
-     return media_type;
- }
- 
-+GstCaps *make_mf_compatible_caps(GstCaps *caps)
-+{
-+    GstCaps *ret;
-+    IMFMediaType *media_type;
-+
-+    if (gst_caps_get_size(caps) != 1)
-+        return NULL;
-+
-+    ret = gst_caps_copy(caps);
-+
-+    if ((media_type = mf_media_type_from_caps(ret)))
-+        IMFMediaType_Release(media_type);
-+
-+    if (!media_type)
-+    {
-+        gst_caps_unref(ret);
-+        return NULL;
-+    }
-+
-+    return ret;
-+}
-+
- GstCaps *caps_from_mf_media_type(IMFMediaType *type)
- {
-     GUID major_type;
 -- 
 2.28.0

--- a/patches/mfplat-streaming-support/0006-winegstreamer-Translate-H.264-caps-to-attributes.patch
+++ b/patches/mfplat-streaming-support/0006-winegstreamer-Translate-H.264-caps-to-attributes.patch
@ -1,15 +1,15 @@
-From 7f8e08bb35cb2a9432a0f827f67b232d488d1051 Mon Sep 17 00:00:00 2001
+From b4501cee4e60bc89c926de676db5945be58cf44a Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 24 Mar 2020 16:00:26 -0500
-Subject: [PATCH] winegstreamer: Translate H.264 caps to attributes.
+Subject: [PATCH 06/45] winegstreamer: Translate H.264 caps to attributes.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/winegstreamer/mfplat.c | 80 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 80 insertions(+)
+ dlls/winegstreamer/mfplat.c | 75 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 75 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index bed5d0cc31c..5e6b5a8ec33 100644
+index 7a877c2a416..f543c774b1d 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -26,6 +26,7 @@
@ -95,21 +95,11 @@ index bed5d0cc31c..5e6b5a8ec33 100644
         else
         {
             FIXME("Unrecognized video format %s\n", mime_type);
-@@ -606,11 +675,22 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
- {
-     GstCaps *ret;
-     IMFMediaType *media_type;
-+    GstStructure *structure;
-+    const char *mime_type;
- 
-     if (gst_caps_get_size(caps) != 1)
-         return NULL;
- 
-     ret = gst_caps_copy(caps);
-+    structure = gst_caps_get_structure(ret, 0);
-+    mime_type = gst_structure_get_name(structure);
-+
-+    if (!strcmp(mime_type, "video/x-h264"))
+@@ -646,6 +715,12 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
+             }
+         }
+     }
+    else if (!strcmp(mime_type, "video/x-h264"))
 +    {
 +        gst_caps_set_simple(ret, "stream-format", G_TYPE_STRING, "byte-stream", NULL);
 +        gst_caps_set_simple(ret, "alignment", G_TYPE_STRING, "au", NULL);
--- a/patches/mfplat-streaming-support/0007-winegstreamer-Translate-WMV-caps-to-attributes.patch
+++ b/patches/mfplat-streaming-support/0007-winegstreamer-Translate-WMV-caps-to-attributes.patch
@ -1,7 +1,7 @@
-From 7d6c748a2fe172d3c59ef225c87cd10bac45d1b7 Mon Sep 17 00:00:00 2001
+From 30499cfad9d6eee935b00e6efff8fec72a60dc99 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 24 Mar 2020 16:01:20 -0500
-Subject: [PATCH] winegstreamer: Translate WMV caps to attributes.
+Subject: [PATCH 07/45] winegstreamer: Translate WMV caps to attributes.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 51 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 5e6b5a8ec33..1ed1ed2f825 100644
+index f543c774b1d..eb88d6ed6a2 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -457,6 +457,24 @@ uncompressed_video_formats[] =
--- a/patches/mfplat-streaming-support/0008-winegstreamer-Translate-AAC-caps-to-attributes.patch
+++ b/patches/mfplat-streaming-support/0008-winegstreamer-Translate-AAC-caps-to-attributes.patch
@ -1,7 +1,7 @@
-From 6e954ed74dbf7ab37b5a3b75d12a0a50a8a1e3ce Mon Sep 17 00:00:00 2001
+From 266a53b56c1f6e7b2704a2aced3cf0aac4d3c616 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 24 Mar 2020 16:02:27 -0500
-Subject: [PATCH] winegstreamer: Translate AAC caps to attributes.
+Subject: [PATCH 08/45] winegstreamer: Translate AAC caps to attributes.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 108 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 1ed1ed2f825..a1958f79807 100644
+index eb88d6ed6a2..6958806dc4f 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -457,6 +457,15 @@ uncompressed_video_formats[] =
--- a/patches/mfplat-streaming-support/0009-winegstreamer-Translate-MPEG-4-Section-2-caps-to-att.patch
+++ b/patches/mfplat-streaming-support/0009-winegstreamer-Translate-MPEG-4-Section-2-caps-to-att.patch
@ -1,7 +1,8 @@
-From 134086a1d60e24065d0556ada3070603834036d8 Mon Sep 17 00:00:00 2001
+From 260e005c6b7b7998961d123f457f32568770fc11 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 25 Mar 2020 13:36:19 -0500
-Subject: [PATCH] winegstreamer: Translate MPEG-4 Section-2 caps to attributes.
+Subject: [PATCH 09/45] winegstreamer: Translate MPEG-4 Section-2 caps to
+ attributes.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,7 +10,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 16 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index a1958f79807..c05b9ddf41a 100644
+index 6958806dc4f..96943f77a70 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -650,6 +650,22 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
--- a/patches/mfplat-streaming-support/0010-winegstreamer-Translate-WMA-caps-to-attributes.patch
+++ b/patches/mfplat-streaming-support/0010-winegstreamer-Translate-WMA-caps-to-attributes.patch
@ -1,7 +1,7 @@
-From d07c302989c043d23091accafdc998cf1851d12f Mon Sep 17 00:00:00 2001
+From bcbc7087c297e0f739608b2b3538db4e40cb9b1d Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 12 May 2020 17:05:41 -0500
-Subject: [PATCH] winegstreamer: Translate WMA caps to attributes.
+Subject: [PATCH 10/45] winegstreamer: Translate WMA caps to attributes.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 24 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index c05b9ddf41a..416daa7b8a6 100644
+index 96943f77a70..28e0163cdf2 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -830,6 +830,30 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
--- a/patches/mfplat-streaming-support/0011-winegstreamer-Translate-H.264-attributes-to-caps.patch
+++ b/patches/mfplat-streaming-support/0011-winegstreamer-Translate-H.264-attributes-to-caps.patch
@ -1,7 +1,7 @@
-From be591787edbf17c43034f44eff3b0cb55296ae83 Mon Sep 17 00:00:00 2001
+From aa5bec9bd28415efeb564a620391319653e92135 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 24 Mar 2020 16:18:40 -0500
-Subject: [PATCH] winegstreamer: Translate H.264 attributes to caps.
+Subject: [PATCH 11/45] winegstreamer: Translate H.264 attributes to caps.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 71 insertions(+), 19 deletions(-)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 416daa7b8a6..5ccae20e8bb 100644
+index 28e0163cdf2..25ff06b16a1 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -918,10 +918,6 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -948,10 +948,6 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
     {
         UINT64 frame_rate = 0, frame_size = 0;
         DWORD width, height;
@ -23,7 +23,7 @@ index 416daa7b8a6..5ccae20e8bb 100644
 
         if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
             return NULL;
-@@ -930,28 +926,84 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -960,28 +956,84 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
 
         output = gst_caps_new_empty_simple("video/x-raw");
 
--- a/patches/mfplat-streaming-support/0012-winegstreamer-Translate-WMV-attributes-to-caps.patch
+++ b/patches/mfplat-streaming-support/0012-winegstreamer-Translate-WMV-attributes-to-caps.patch
@ -1,7 +1,7 @@
-From 43e6b3be2fd3a5e4b6ddb4e8eb1833c69c2ef817 Mon Sep 17 00:00:00 2001
+From 15d2a62517079def88c968af852f04dc3ae815de Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 24 Mar 2020 16:20:17 -0500
-Subject: [PATCH] winegstreamer: Translate WMV attributes to caps.
+Subject: [PATCH 12/45] winegstreamer: Translate WMV attributes to caps.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 51 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 5ccae20e8bb..ffb6a303d34 100644
+index 25ff06b16a1..402693c424e 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -903,6 +903,21 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
+@@ -933,6 +933,21 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
     return ret;
 }
 
@ -34,7 +34,7 @@ index 5ccae20e8bb..ffb6a303d34 100644
 GstCaps *caps_from_mf_media_type(IMFMediaType *type)
 {
     GUID major_type;
-@@ -974,6 +989,42 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1004,6 +1019,42 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                     gst_caps_set_simple(output, "level", G_TYPE_STRING, level, NULL);
             }
         }
--- a/patches/mfplat-streaming-support/0013-winegstreamer-Translate-AAC-attributes-to-caps.patch
+++ b/patches/mfplat-streaming-support/0013-winegstreamer-Translate-AAC-attributes-to-caps.patch
@ -1,7 +1,7 @@
-From 272225ae4f7e9dea77c90c783fc3a49373387cee Mon Sep 17 00:00:00 2001
+From 7efecdc8387632f3fc1790a7ddc01a2dfd79369b Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 21 Apr 2020 10:31:02 -0500
-Subject: [PATCH] winegstreamer: Translate AAC attributes to caps.
+Subject: [PATCH 13/45] winegstreamer: Translate AAC attributes to caps.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 66 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index ffb6a303d34..bbba4d718f6 100644
+index 402693c424e..1f085e9b4b4 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1105,6 +1105,72 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1135,6 +1135,72 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                 return NULL;
             }
         }
--- a/patches/mfplat-streaming-support/0014-winegstreamer-Translate-MPEG-4-Section-2-attributes-.patch
+++ b/patches/mfplat-streaming-support/0014-winegstreamer-Translate-MPEG-4-Section-2-attributes-.patch
@ -1,7 +1,8 @@
-From 186b88f42753dd6d26aee1f29d27de77984b9e3c Mon Sep 17 00:00:00 2001
+From a69723134dcf8069a7cdafbaa10dee6a37676571 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 11 May 2020 16:03:09 -0500
-Subject: [PATCH] winegstreamer: Translate MPEG-4 Section-2 attributes to caps.
+Subject: [PATCH 14/45] winegstreamer: Translate MPEG-4 Section-2 attributes to
+ caps.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,10 +10,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 8 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index bbba4d718f6..e952a782bc1 100644
+index 1f085e9b4b4..443adab0a8f 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1025,6 +1025,14 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1055,6 +1055,14 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
 
             user_data_to_codec_data(type, output);
         }
--- a/patches/mfplat-streaming-support/0015-winegstreamer-Translate-WMA-attributes-to-caps.patch
+++ b/patches/mfplat-streaming-support/0015-winegstreamer-Translate-WMA-attributes-to-caps.patch
@ -1,7 +1,7 @@
-From 8745a3af3b1a85285acf6b7196b3850cdf26c3bb Mon Sep 17 00:00:00 2001
+From 3e3c934208f0eb186919e82894d6f5a68882d460 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 12 May 2020 17:05:59 -0500
-Subject: [PATCH] winegstreamer: Translate WMA attributes to caps.
+Subject: [PATCH 15/45] winegstreamer: Translate WMA attributes to caps.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 1 file changed, 15 insertions(+)

 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index e952a782bc1..dddf0ac9fa4 100644
+index 443adab0a8f..15c38254bf5 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1179,6 +1179,21 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1209,6 +1209,21 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                 CoTaskMemFree(user_data);
             }
         }
--- a/patches/mfplat-streaming-support/0016-tools-Add-support-for-multiple-parent-directories.patch
+++ b/patches/mfplat-streaming-support/0016-tools-Add-support-for-multiple-parent-directories.patch
@ -1,7 +1,7 @@
-From b693146a13990fa4361a18a47308aae97da92b1c Mon Sep 17 00:00:00 2001
+From 999d7a93536ecd9d3daa66adff2ed5d2ce375386 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 29 Jan 2020 15:37:39 -0600
-Subject: [PATCH] tools: Add support for multiple parent directories.
+Subject: [PATCH 16/45] tools: Add support for multiple parent directories.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
--- a/patches/mfplat-streaming-support/0017-mf-Introduce-handler-helper.patch
+++ b/patches/mfplat-streaming-support/0017-mf-Introduce-handler-helper.patch
@ -1,7 +1,7 @@
-From e97b113c42663be4b989c098703013da75a6ad1a Mon Sep 17 00:00:00 2001
+From df5412c890e61326fc5bb5cfd96a3a7a311d89e6 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 29 Jan 2020 15:30:49 -0600
-Subject: [PATCH] mf: Introduce handler helper.
+Subject: [PATCH 17/45] mf: Introduce handler helper.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -932,7 +932,7 @@ index e578d194f7f..f2e87494459 100644
 	media_source.c \
 	mediatype.c \
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 337c4f52c35..5eeb0e1ffcb 100644
+index ea299c124dd..2df86814679 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
@@ -23,6 +23,7 @@
@ -943,7 +943,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 
 #include <assert.h>
 #include <stdarg.h>
-@@ -1500,21 +1501,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1608,21 +1609,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
     return hr;
 }
 
@ -966,7 +966,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 };
 
 static struct winegstreamer_stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface)
-@@ -1522,11 +1513,6 @@ static struct winegstreamer_stream_handler *impl_from_IMFByteStreamHandler(IMFBy
+@@ -1630,11 +1621,6 @@ static struct winegstreamer_stream_handler *impl_from_IMFByteStreamHandler(IMFBy
     return CONTAINING_RECORD(iface, struct winegstreamer_stream_handler, IMFByteStreamHandler_iface);
 }
 
@ -978,7 +978,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 static HRESULT WINAPI winegstreamer_stream_handler_QueryInterface(IMFByteStreamHandler *iface, REFIID riid, void **obj)
 {
     TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
-@@ -1556,247 +1542,44 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if
+@@ -1664,247 +1650,44 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if
 
 static ULONG WINAPI winegstreamer_stream_handler_Release(IMFByteStreamHandler *iface)
 {
@ -1233,7 +1233,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 }
 
 static HRESULT WINAPI winegstreamer_stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes)
-@@ -1816,47 +1599,16 @@ static const IMFByteStreamHandlerVtbl winegstreamer_stream_handler_vtbl =
+@@ -1924,47 +1707,16 @@ static const IMFByteStreamHandlerVtbl winegstreamer_stream_handler_vtbl =
     winegstreamer_stream_handler_GetMaxNumberOfBytesRequiredForResolution,
 };
 
@ -1284,7 +1284,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 
         if (FAILED(hr = media_source_constructor(stream, &new_source)))
             return hr;
-@@ -1875,64 +1627,6 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s
+@@ -1983,64 +1735,6 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s
     }
 }
 
@ -1349,7 +1349,7 @@ index 337c4f52c35..5eeb0e1ffcb 100644
 HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
 {
     struct winegstreamer_stream_handler *this;
-@@ -1944,11 +1638,9 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
+@@ -2052,11 +1746,9 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
     if (!this)
         return E_OUTOFMEMORY;
 
--- a/patches/mfplat-streaming-support/0018-Introduce-IMFSample-GstBuffer-converter.patch
+++ b/patches/mfplat-streaming-support/0018-Introduce-IMFSample-GstBuffer-converter.patch
@ -1,7 +1,7 @@
-From cb229a30f5a76980cd6111350c5e63cf0ffcf13d Mon Sep 17 00:00:00 2001
+From e92f897fc9590659e579ee2d5cf366b5eeb617f4 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 25 Mar 2020 10:43:27 -0500
-Subject: [PATCH] Introduce IMFSample -> GstBuffer converter.
+Subject: [PATCH 18/45] Introduce IMFSample -> GstBuffer converter.

 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@ -22,10 +22,10 @@ index 75fc7dc90a8..321143396d6 100644
 HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
 
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index dddf0ac9fa4..e2f8f6e0a43 100644
+index 15c38254bf5..7b7300d5e8e 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1293,3 +1293,77 @@ done:
+@@ -1323,3 +1323,77 @@ done:
 
     return out;
 }
--- a/patches/mfplat-streaming-support/0019-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch
+++ b/patches/mfplat-streaming-support/0019-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch
@ -1,7 +1,7 @@
-From f2a4bf49f6a283c5e679d5b968da1fe5294f9144 Mon Sep 17 00:00:00 2001
+From 4ad320392b3671f27fa79609ec942e0a5c741da1 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 16 Mar 2020 12:09:39 -0500
-Subject: [PATCH] winegstreamer: Implement decoder MFT on gstreamer.
+Subject: [PATCH 19/45] winegstreamer: Implement decoder MFT on gstreamer.

 ---
 dlls/winegstreamer/Makefile.in               |    1 +
@ -1530,7 +1530,7 @@ index 00000000000..70a20ebe69b
 +    }
 +}
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index e2f8f6e0a43..f60828d8dc8 100644
+index 7b7300d5e8e..7ff01b5b4bd 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
@@ -406,6 +406,16 @@ failed:
@ -1700,10 +1700,10 @@ index 1dc4ba9a10b..3f28b4ddec4 100644
 +]
 +coclass CMSAACDecMFT { }
 diff --git a/include/mfidl.idl b/include/mfidl.idl
-index 9f2d825bd5f..20164c39253 100644
+index dd5de8d0d2f..4023c3a62d2 100644
 --- a/include/mfidl.idl
 +++ b/include/mfidl.idl
-@@ -1290,3 +1290,5 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365,
+@@ -1306,3 +1306,5 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365,
 cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);")
 
 cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")
--- a/patches/mfplat-streaming-support/0020-mfreadwrite-Select-all-streams-when-creating-a-sourc.patch
+++ b/patches/mfplat-streaming-support/0020-mfreadwrite-Select-all-streams-when-creating-a-sourc.patch
@ -1,7 +1,7 @@
-From eb16c9cdd1ce7f62b66a80b8680d6665e2c5c669 Mon Sep 17 00:00:00 2001
+From 5913e02f7c67c8f8214efd9de4e095f189fcca2e Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 23 Mar 2020 11:55:41 -0500
-Subject: [PATCH] mfreadwrite: Select all streams when creating a source
+Subject: [PATCH 20/45] mfreadwrite: Select all streams when creating a source
 reader.

 ---
@ -9,10 +9,10 @@ Subject: [PATCH] mfreadwrite: Select all streams when creating a source
 1 file changed, 4 insertions(+)

 diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c
-index 7dcae5a1cfa..93858840940 100644
+index cc1b29a2b6a..935074d62f9 100644
 --- a/dlls/mfreadwrite/reader.c
 +++ b/dlls/mfreadwrite/reader.c
-@@ -2128,6 +2128,10 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri
+@@ -2127,6 +2127,10 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri
             break;
 
         object->streams[i].index = i;
--- a/Show More
+++ b/Show More