Updated mfplat-streaming-support patchset

patches/mfplat-streaming-support/0001-mf-Unconditionally-deliver-NULL-EOS-samples.patch

@@ -0,0 +1,32 @@
+From 5b02ea1ed7f44fba8070b9a2ef69b78eb02bf3d7 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.
+
+Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
+---
+ dlls/mf/session.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/mf/session.c b/dlls/mf/session.c
+index a1b54b7080e..7c82aa42a4b 100644
+--- a/dlls/mf/session.c
++++ b/dlls/mf/session.c
+@@ -2599,11 +2599,12 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop
+                 LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples,
+                         struct sample, entry)
+                 {
+-                    if (!topo_node->u.transform.outputs[i].requests)
++                    if (!topo_node->u.transform.outputs[i].requests && sample_entry->sample)
+                         break;
+ 
+                     session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample);
+-                    topo_node->u.transform.outputs[i].requests--;
++                    if (sample_entry->sample)
++                        topo_node->u.transform.outputs[i].requests--;
+ 
+                     transform_release_sample(sample_entry);
+                 }
+-- 
+2.28.0
+

patches/mfplat-streaming-support/0002-winegstreamer-Insert-videoconvert-into-decoded-video.patch

@@ -1,4 +1,4 @@
-From 99b43be87b11803938b12b08298406391b77d510 Mon Sep 17 00:00:00 2001
+From fed4032224546cabe827c6621d31d5a72d11c05e Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 25 Aug 2020 17:35:49 -0500
 Subject: [PATCH] winegstreamer: Insert videoconvert into decoded-video
@@ -6,20 +6,31 @@ Subject: [PATCH] winegstreamer: Insert videoconvert into decoded-video
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/winegstreamer/media_source.c | 104 ++++++++++++++++++++++++------
- 1 file changed, 85 insertions(+), 19 deletions(-)
+ dlls/winegstreamer/media_source.c | 125 ++++++++++++++++++++++++++----
+ 1 file changed, 111 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 92b4100f7bc..a9aff0eb296 100644
+index 5f3c43a0204..258b8c2dfb1 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -430,8 +430,22 @@ static HRESULT media_stream_align_with_mf(struct media_stream *stream)
-         g_free(source_caps_str);
-     }
+@@ -384,6 +384,43 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
+     media_stream_RequestSample
+ };
  
--    if (!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "video/x-raw") ||
--        !strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "audio/x-raw"))
-+    if (!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "video/x-raw"))
++/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType
++   the user throws at us through gstreamer's caps negotiation. */
++static HRESULT media_stream_connect_to_sink(struct media_stream *stream)
++{
++    GstCaps *source_caps = gst_pad_query_caps(stream->their_src, NULL);
++    const gchar *stream_type;
++
++    if (!source_caps)
++        return E_FAIL;
++
++    stream_type = gst_structure_get_name(gst_caps_get_structure(source_caps, 0));
++    gst_caps_unref(source_caps);
++
++    if (!strcmp(stream_type, "video/x-raw"))
 +    {
 +        GstElement *videoconvert = gst_element_factory_make("videoconvert", NULL);
 +
@@ -27,115 +38,128 @@ index 92b4100f7bc..a9aff0eb296 100644
 +
 +        stream->my_sink = gst_element_get_static_pad(videoconvert, "sink");
 +
-+        assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK);
-+        assert(gst_element_link(videoconvert, stream->appsink));
++        if (!gst_element_link(videoconvert, stream->appsink))
++            return E_FAIL;
 +
 +        gst_element_sync_state_with_parent(videoconvert);
-+
-+        g_object_set(stream->appsink, "caps", source_caps, NULL);
 +    }
-+    else if(!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "audio/x-raw"))
-     {
-         stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
-         g_object_set(stream->appsink, "caps", source_caps, NULL);
-@@ -569,37 +583,89 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
++    else
++    {
++        stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
++    }
++
++    if (gst_pad_link(stream->their_src, stream->my_sink) != GST_PAD_LINK_OK)
++        return E_FAIL;
++
++    return S_OK;
++}
++
+ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream)
+ {
+     struct media_stream *object = heap_alloc_zero(sizeof(*object));
+@@ -414,8 +451,8 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD
+     g_object_set(object->appsink, "sync", FALSE, NULL);
+     g_object_set(object->appsink, "max-buffers", 5, NULL);
+ 
+-    object->my_sink = gst_element_get_static_pad(object->appsink, "sink");
+-    gst_pad_link(object->their_src, object->my_sink);
++    if (FAILED(hr = media_stream_connect_to_sink(object)))
++        goto fail;
+ 
+     gst_element_sync_state_with_parent(object->appsink);
+ 
+@@ -435,28 +472,88 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
  {
      GstCaps *current_caps = gst_pad_get_current_caps(stream->their_src);
      IMFMediaTypeHandler *type_handler;
 +    IMFMediaType **stream_types = NULL;
      IMFMediaType *stream_type = NULL;
 +    DWORD type_count = 0;
++    const gchar *major_type;
 +    unsigned int i;
      HRESULT hr;
  
--    if (strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw") &&
--        strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "audio/x-raw"))
-+    if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw"))
-     {
--        GstCaps *compatible_caps = make_mf_compatible_caps(current_caps);
--        stream_type = mf_media_type_from_caps(compatible_caps);
--        gst_caps_unref(compatible_caps);
-+        GstElementFactory *videoconvert_factory = gst_element_factory_find("videoconvert");
-+        /* output every format supported by videoconvert */
-+        const GList *template_list = gst_element_factory_get_static_pad_templates(videoconvert_factory);
-+        for (;template_list; template_list = template_list->next)
-+        {
-+            GstStaticPadTemplate *template = (GstStaticPadTemplate *)template_list->data;
-+            GstCaps *src_caps;
-+            GValueArray *formats;
-+            if (template->direction != GST_PAD_SRC)
-+                continue;
-+            src_caps = gst_static_pad_template_get_caps(template);
-+            gst_structure_get_list(gst_caps_get_structure(src_caps, 0), "format", &formats);
-+            stream_types = heap_alloc( sizeof(IMFMediaType*) * formats->n_values );
-+            for (i = 0; i < formats->n_values; i++)
-+            {
-+                GValue *format = g_value_array_get_nth(formats, i);
-+                GstCaps *modified_caps = gst_caps_copy(current_caps);
-+                gst_caps_set_value(modified_caps, "format", format);
-+                stream_types[type_count] = mf_media_type_from_caps(modified_caps);
-+                gst_caps_unref(modified_caps);
-+                if (stream_types[type_count])
-+                    type_count++;
-+            }
-+            g_value_array_free(formats);
-+            gst_caps_unref(src_caps);
-+            break;
-+        }
-     }
--    else
-+    else if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "audio/x-raw"))
+-    stream_type = mf_media_type_from_caps(current_caps);
+-    gst_caps_unref(current_caps);
+-    if (!stream_type)
+-        return E_FAIL;
++    major_type = gst_structure_get_name(gst_caps_get_structure(current_caps, 0));
++
++    if (!strcmp(major_type, "video/x-raw"))
 +    {
-         stream_type = mf_media_type_from_caps(current_caps);
++        /* These are the most common native output types of decoders:
++            https://docs.microsoft.com/en-us/windows/win32/medfound/mft-decoder-expose-output-types-in-native-order */
++        static const GUID *const video_types[] =
++        {
++            &MFVideoFormat_NV12,
++            &MFVideoFormat_YV12,
++            &MFVideoFormat_YUY2,
++            &MFVideoFormat_IYUV,
++            &MFVideoFormat_I420,
++        };
+ 
+-    hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor);
++        IMFMediaType *base_type = mf_media_type_from_caps(current_caps);
++        GUID base_subtype;
+ 
+-    IMFMediaType_Release(stream_type);
++        IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype);
+ 
+-    if (FAILED(hr))
+-        return hr;
++        stream_types = heap_alloc( sizeof(IMFMediaType *) * ARRAY_SIZE(video_types) + 1);
+ 
+-    if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler)))
+-        return hr;
++        stream_types[0] = base_type;
++        type_count = 1;
+ 
+-    hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type);
++        for (i = 0; i < ARRAY_SIZE(video_types); i++)
++        {
++            IMFMediaType *new_type;
+ 
+-    IMFMediaTypeHandler_Release(type_handler);
++            if (IsEqualGUID(&base_subtype, video_types[i]))
++                continue;
+ 
++            if (FAILED(hr = MFCreateMediaType(&new_type)))
++                goto done;
++            stream_types[type_count++] = new_type;
++
++            if (FAILED(hr = IMFMediaType_CopyAllItems(base_type, (IMFAttributes *) new_type)))
++                goto done;
++            if (FAILED(hr = IMFMediaType_SetGUID(new_type, &MF_MT_SUBTYPE, video_types[i])))
++                goto done;
++        }
++    }
++    else
++    {
++        stream_type = mf_media_type_from_caps(current_caps);
 +        if (stream_type)
 +        {
 +            stream_types = &stream_type;
 +            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;
-+            }
-+        }
-+    }
- 
-     gst_caps_unref(current_caps);
--    if (!stream_type)
++
 +    if (!type_count)
 +    {
 +        ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n");
-         return E_FAIL;
++        return E_FAIL;
 +    }
- 
--    hr = MFCreateStreamDescriptor(stream->stream_id, 1, &stream_type, &stream->descriptor);
--
--    IMFMediaType_Release(stream_type);
--
--    if (FAILED(hr))
--        return hr;
++
 +    if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor)))
 +        goto done;
- 
-     if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler)))
--        return hr;
--
--    hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_type);
++
++    if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler)))
 +        goto done;
- 
--    IMFMediaTypeHandler_Release(type_handler);
++
 +    if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0])))
 +        goto done;
- 
++
 +done:
++    gst_caps_unref(current_caps);
 +    if (type_handler)
 +        IMFMediaTypeHandler_Release(type_handler);
 +    for (i = 0; i < type_count; i++)

patches/mfplat-streaming-support/0003-winegstreamer-Insert-audioconvert-into-decoded-audio.patch

@@ -1,4 +1,4 @@
-From b5f1fc2793dce6165b509cc326163d71601d963c Mon Sep 17 00:00:00 2001
+From 87976eb22d5dc1f453edbdf713a768d67d83b1c4 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 25 Aug 2020 17:37:28 -0500
 Subject: [PATCH] winegstreamer: Insert audioconvert into decoded audio
@@ -6,34 +6,33 @@ Subject: [PATCH] winegstreamer: Insert audioconvert into decoded audio
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/winegstreamer/media_source.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ 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 a9aff0eb296..6190ac57e0e 100644
+index 258b8c2dfb1..d6c7837e544 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -447,9 +447,18 @@ static HRESULT media_stream_align_with_mf(struct media_stream *stream)
+@@ -410,6 +410,19 @@ static HRESULT media_stream_connect_to_sink(struct media_stream *stream)
+ 
+         gst_element_sync_state_with_parent(videoconvert);
      }
-     else if(!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "audio/x-raw"))
-     {
--        stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
--        g_object_set(stream->appsink, "caps", source_caps, NULL);
++    else if (!strcmp(stream_type, "audio/x-raw"))
++    {
 +        GstElement *audioconvert = gst_element_factory_make("audioconvert", NULL);
 +
 +        gst_bin_add(GST_BIN(stream->parent_source->container), audioconvert);
 +
 +        stream->my_sink = gst_element_get_static_pad(audioconvert, "sink");
 +
-         assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK);
-+        assert(gst_element_link(audioconvert, stream->appsink));
++        if (!gst_element_link(audioconvert, stream->appsink))
++            return E_FAIL;
 +
 +        gst_element_sync_state_with_parent(audioconvert);
-+
-+        g_object_set(stream->appsink, "caps", source_caps, NULL);
-     }
++    }
      else
      {
+         stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0004-winegstreamer-Implement-IMFMediaSource-CreatePresent.patch

@@ -1,4 +1,4 @@
-From 2fe4bd639fe92f050ab4c0be2a5e586d4ae5852a Mon Sep 17 00:00:00 2001
+From 577e9cb7c2370660c9e0acd1b409dcca398290e0 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 31 Mar 2020 11:21:21 -0500
 Subject: [PATCH] winegstreamer: Implement
@@ -6,12 +6,25 @@ Subject: [PATCH] winegstreamer: Implement
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/mfplat/tests/mfplat.c        |  9 ++++----
- dlls/winegstreamer/media_source.c | 36 +++++++++++++++++++++++++++++--
- 2 files changed, 38 insertions(+), 7 deletions(-)
+ dlls/mf/tests/mf.c                |  1 -
+ dlls/mfplat/tests/mfplat.c        | 10 +++++-----
+ dlls/winegstreamer/media_source.c | 28 ++++++++++++++++++++++++++--
+ 3 files changed, 31 insertions(+), 8 deletions(-)
 
+diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
+index 351a6e1edab..e6f3593a74b 100644
+--- a/dlls/mf/tests/mf.c
++++ b/dlls/mf/tests/mf.c
+@@ -1451,7 +1451,6 @@ todo_wine
+         return;
+ 
+     hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd);
+-todo_wine
+     ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr);
+     if (FAILED(hr))
+         return;
 diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
-index 309f7b669a4..72d06e31880 100644
+index 55c07adb1fe..7491b53896f 100644
 --- a/dlls/mfplat/tests/mfplat.c
 +++ b/dlls/mfplat/tests/mfplat.c
 @@ -576,10 +576,7 @@ static void test_source_resolver(void)
@@ -25,7 +38,15 @@ index 309f7b669a4..72d06e31880 100644
      ok(descriptor != NULL, "got %p\n", descriptor);
  
      hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(descriptor, 0, &selected, &sd);
-@@ -607,7 +604,10 @@ todo_wine
+@@ -599,6 +596,7 @@ todo_wine
+     ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
+     hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid);
+     ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr);
++todo_wine
+     ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid));
+     IMFMediaType_Release(media_type);
+ 
+@@ -607,7 +605,10 @@ todo_wine
  
      var.vt = VT_EMPTY;
      hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
@@ -36,7 +57,7 @@ index 309f7b669a4..72d06e31880 100644
  
      get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var);
      ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt);
-@@ -670,11 +670,10 @@ todo_wine
+@@ -670,11 +671,10 @@ todo_wine
  
      get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL);
  
@@ -50,7 +71,7 @@ index 309f7b669a4..72d06e31880 100644
      ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
  
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 6190ac57e0e..5f203a946bc 100644
+index d6c7837e544..9b2c2174318 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -67,6 +67,7 @@ struct media_source
@@ -61,7 +82,7 @@ index 6190ac57e0e..5f203a946bc 100644
      GstBus *bus;
      GstElement *container;
      GstElement *decodebin;
-@@ -781,12 +782,19 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
+@@ -673,12 +674,12 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
  {
      struct media_source *source = impl_from_IMFMediaSource(iface);
  
@@ -72,18 +93,11 @@ index 6190ac57e0e..5f203a946bc 100644
          return MF_E_SHUTDOWN;
  
 -    return E_NOTIMPL;
-+    if (!(source->pres_desc))
-+    {
-+        return MF_E_NOT_INITIALIZED;
-+    }
-+
-+    IMFPresentationDescriptor_Clone(source->pres_desc, descriptor);
-+
-+    return S_OK;
++    return IMFPresentationDescriptor_Clone(source->pres_desc, descriptor);
  }
  
  static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor,
-@@ -849,6 +857,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
+@@ -741,6 +742,8 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
      if (source->their_sink)
          gst_object_unref(GST_OBJECT(source->their_sink));
  
@@ -92,7 +106,7 @@ index 6190ac57e0e..5f203a946bc 100644
      if (source->event_queue)
          IMFMediaEventQueue_Shutdown(source->event_queue);
      if (source->byte_stream)
-@@ -954,6 +964,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -841,6 +844,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY);
  
      struct media_source *object = heap_alloc_zero(sizeof(*object));
@@ -100,22 +114,22 @@ index 6190ac57e0e..5f203a946bc 100644
      unsigned int i;
      HRESULT hr;
      int ret;
-@@ -1043,6 +1054,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -928,6 +932,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          gst_sample_unref(preroll);
      }
  
 +    /* init presentation descriptor */
 +
 +    descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*));
-+    for (unsigned int i = 0; i < object->stream_count; i++)
++    for (i = 0; i < object->stream_count; i++)
 +    {
 +        IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]);
 +    }
 +
-+    if (FAILED(MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc)))
++    if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc)))
 +        goto fail;
 +
-+    for (unsigned int i = 0; i < object->stream_count; i++)
++    for (i = 0; i < object->stream_count; i++)
 +    {
 +        IMFPresentationDescriptor_SelectStream(object->pres_desc, i);
 +        IMFStreamDescriptor_Release(descriptors[i]);
@@ -126,12 +140,11 @@ index 6190ac57e0e..5f203a946bc 100644
      object->state = SOURCE_STOPPED;
  
      *out_media_source = object;
-@@ -1051,6 +1081,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -936,6 +959,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      fail:
      WARN("Failed to construct MFMediaSource, hr %#x.\n", hr);
  
-+    if (descriptors)
-+        heap_free(descriptors);
++    heap_free(descriptors);
      IMFMediaSource_Release(&object->IMFMediaSource_iface);
      return hr;
  }

patches/mfplat-streaming-support/0005-winegstreamer-Implement-IMFMediaSource-Start.patch

@@ -1,19 +1,21 @@
-From 94891a5e484b97577df09a4e6ef3106c79d2391a Mon Sep 17 00:00:00 2001
+From 747e873ecc739c3808629b8b16ae3cbf5e8a07d7 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
-Date: Tue, 31 Mar 2020 15:10:03 -0500
+Date: Tue, 24 Mar 2020 16:15:35 -0500
 Subject: [PATCH] winegstreamer: Implement IMFMediaSource::Start.
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
  dlls/mfplat/tests/mfplat.c        |   8 +-
- dlls/winegstreamer/media_source.c | 319 +++++++++++++++++++++++++++++-
- 2 files changed, 317 insertions(+), 10 deletions(-)
+ dlls/winegstreamer/gst_private.h  |   1 +
+ dlls/winegstreamer/media_source.c | 307 +++++++++++++++++++++++++++++-
+ dlls/winegstreamer/mfplat.c       | 125 ++++++++++++
+ 4 files changed, 433 insertions(+), 8 deletions(-)
 
 diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
-index 72d06e31880..e6a1694a11f 100644
+index 7491b53896f..ef9837c0a8a 100644
 --- a/dlls/mfplat/tests/mfplat.c
 +++ b/dlls/mfplat/tests/mfplat.c
-@@ -604,10 +604,7 @@ static void test_source_resolver(void)
+@@ -605,10 +605,7 @@ todo_wine
  
      var.vt = VT_EMPTY;
      hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
@@ -24,7 +26,7 @@ index 72d06e31880..e6a1694a11f 100644
  
      get_event((IMFMediaEventGenerator *)mediasource, MENewStream, &var);
      ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MENewStream event.\n", var.vt);
-@@ -625,10 +622,13 @@ todo_wine
+@@ -626,10 +623,13 @@ todo_wine
          hr = IMFMediaStream_RequestSample(video_stream, NULL);
          if (i == sample_count)
              break;
@@ -38,7 +40,7 @@ index 72d06e31880..e6a1694a11f 100644
  
      for (i = 0; i < sample_count; ++i)
      {
-@@ -666,11 +666,11 @@ todo_wine
+@@ -667,11 +667,11 @@ todo_wine
  
      hr = IMFMediaStream_RequestSample(video_stream, NULL);
      ok(hr == MF_E_END_OF_STREAM, "Unexpected hr %#x.\n", hr);
@@ -51,20 +53,31 @@ index 72d06e31880..e6a1694a11f 100644
      IMFMediaTypeHandler_Release(handler);
      IMFPresentationDescriptor_Release(descriptor);
  
+diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
+index 60b38a48f5a..07556802a51 100644
+--- a/dlls/winegstreamer/gst_private.h
++++ b/dlls/winegstreamer/gst_private.h
+@@ -57,6 +57,7 @@ extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj)
+ 
+ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
+ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps) DECLSPEC_HIDDEN;
++GstCaps *caps_from_mf_media_type(IMFMediaType *type) DECLSPEC_HIDDEN;
+ 
+ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
+ 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 5f203a946bc..d6ea8b52aca 100644
+index 9b2c2174318..70c5b47ba84 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -55,14 +55,39 @@ struct media_stream
+@@ -55,14 +55,38 @@ struct media_stream
      {
          STREAM_INACTIVE,
          STREAM_SHUTDOWN,
 +        STREAM_RUNNING,
      } state;
      DWORD stream_id;
-+    BOOL eos;
-+};
-+
+ };
+ 
 +enum source_async_op
 +{
 +    SOURCE_ASYNC_START,
@@ -84,8 +97,8 @@ index 5f203a946bc..d6ea8b52aca 100644
 +            PROPVARIANT position;
 +        } start;
 +    } u;
- };
- 
++};
++
  struct media_source
  {
      IMFMediaSource IMFMediaSource_iface;
@@ -95,7 +108,7 @@ index 5f203a946bc..d6ea8b52aca 100644
      IMFMediaEventQueue *event_queue;
      IMFByteStream *byte_stream;
      struct media_stream **streams;
-@@ -76,6 +101,7 @@ struct media_source
+@@ -76,6 +100,7 @@ struct media_source
      {
          SOURCE_OPENING,
          SOURCE_STOPPED,
@@ -103,7 +116,7 @@ index 5f203a946bc..d6ea8b52aca 100644
          SOURCE_SHUTDOWN,
      } state;
      HANDLE no_more_pads_event;
-@@ -91,7 +117,265 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac
+@@ -91,7 +116,260 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac
      return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface);
  }
  
@@ -214,11 +227,12 @@ index 5f203a946bc..d6ea8b52aca 100644
 +{
 +    ULONG sd_count;
 +    IMFStreamDescriptor *ret;
++    unsigned int i;
 +
 +    if (FAILED(IMFPresentationDescriptor_GetStreamDescriptorCount(pres_desc, &sd_count)))
 +        return NULL;
 +
-+    for (unsigned int i = 0; i < sd_count; i++)
++    for (i = 0; i < sd_count; i++)
 +    {
 +        DWORD stream_id;
 +
@@ -233,13 +247,16 @@ index 5f203a946bc..d6ea8b52aca 100644
 +    return NULL;
 +}
 +
-+static HRESULT start_pipeline(struct media_source *source, struct source_async_command *command)
++static void start_pipeline(struct media_source *source, struct source_async_command *command)
 +{
 +    PROPVARIANT *position = &command->u.start.position;
 +    BOOL seek_message = source->state != SOURCE_STOPPED && position->vt != VT_EMPTY;
++    GstStateChangeReturn ret;
++    unsigned int i;
 +
 +    gst_element_set_state(source->container, GST_STATE_PAUSED);
-+    assert(gst_element_get_state(source->container, NULL, NULL, -1) == GST_STATE_CHANGE_SUCCESS);
++    ret = gst_element_get_state(source->container, NULL, NULL, -1);
++    assert(ret == GST_STATE_CHANGE_SUCCESS);
 +
 +    /* seek to beginning on stop->play */
 +    if (source->state == SOURCE_STOPPED && position->vt == VT_EMPTY)
@@ -248,7 +265,7 @@ index 5f203a946bc..d6ea8b52aca 100644
 +        position->u.hVal.QuadPart = 0;
 +    }
 +
-+    for (unsigned int i = 0; i < source->stream_count; i++)
++    for (i = 0; i < source->stream_count; i++)
 +    {
 +        struct media_stream *stream;
 +        IMFStreamDescriptor *sd;
@@ -259,7 +276,6 @@ index 5f203a946bc..d6ea8b52aca 100644
 +        DWORD stream_id;
 +        BOOL was_active;
 +        BOOL selected;
-+        BOOL changed_caps;
 +
 +        stream = source->streams[i];
 +
@@ -278,12 +294,10 @@ index 5f203a946bc..d6ea8b52aca 100644
 +            IMFMediaTypeHandler_GetCurrentMediaType(mth, &current_mt);
 +            current_caps = caps_from_mf_media_type(current_mt);
 +            g_object_get(stream->appsink, "caps", &prev_caps, NULL);
-+            changed_caps = !gst_caps_is_equal(prev_caps, current_caps);
-+
-+            if (changed_caps)
++            if (!gst_caps_is_equal(prev_caps, current_caps))
 +            {
-+                g_object_set(stream->appsink, "caps", current_caps, NULL);
 +                GstEvent *reconfigure_event = gst_event_new_reconfigure();
++                g_object_set(stream->appsink, "caps", current_caps, NULL);
 +                gst_pad_push_event(gst_element_get_static_pad(stream->appsink, "sink"), reconfigure_event);
 +            }
 +
@@ -293,24 +307,23 @@ index 5f203a946bc..d6ea8b52aca 100644
 +            IMFMediaTypeHandler_Release(mth);
 +        }
 +
++        g_object_set(stream->appsink, "drop", !selected, NULL);
++
 +        if (position->vt != VT_EMPTY)
 +        {
 +            GstEvent *seek_event = gst_event_new_seek(1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
 +                    GST_SEEK_TYPE_SET, position->u.hVal.QuadPart / 100, GST_SEEK_TYPE_NONE, 0);
-+
++            GstSample *preroll;
 +
 +            gst_pad_push_event(stream->my_sink, seek_event);
-+            gst_bus_poll(source->bus, GST_MESSAGE_RESET_TIME, -1);
-+
-+            stream->eos = FALSE;
 +        }
 +
 +        if (selected)
 +        {
 +            TRACE("Stream %u (%p) selected\n", i, stream);
 +            IMFMediaEventQueue_QueueEventParamUnk(source->event_queue,
-+            was_active ? MEUpdatedStream : MENewStream, &GUID_NULL,
-+            S_OK, (IUnknown*) &stream->IMFMediaStream_iface);
++                was_active ? MEUpdatedStream : MENewStream, &GUID_NULL,
++                S_OK, (IUnknown*) &stream->IMFMediaStream_iface);
 +
 +            IMFMediaEventQueue_QueueEventParamVar(stream->event_queue,
 +                seek_message ? MEStreamSeeked : MEStreamStarted, &GUID_NULL, S_OK, position);
@@ -324,9 +337,6 @@ index 5f203a946bc..d6ea8b52aca 100644
 +    source->state = SOURCE_RUNNING;
 +
 +    gst_element_set_state(source->container, GST_STATE_PLAYING);
-+    gst_element_get_state(source->container, NULL, NULL, -1);
-+
-+    return S_OK;
 +}
 +
 +static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
@@ -348,8 +358,6 @@ index 5f203a946bc..d6ea8b52aca 100644
 +        case SOURCE_ASYNC_START:
 +            start_pipeline(source, command);
 +            break;
-+        default:
-+            ;
 +    }
 +
 +    IUnknown_Release(state);
@@ -370,18 +378,7 @@ index 5f203a946bc..d6ea8b52aca 100644
          GstBuffer **buf)
  {
      struct media_source *source = gst_pad_get_element_private(pad);
-@@ -240,8 +524,8 @@ GstBusSyncReply bus_watch(GstBus *bus, GstMessage *message, gpointer user)
-             break;
-     }
- 
--    gst_message_unref(message);
--    return GST_BUS_DROP;
-+    /* FIXME: drop messages and find a substitute for gst_bus_poll */
-+    return GST_BUS_PASS;
- }
- 
- static HRESULT WINAPI media_stream_QueryInterface(IMFMediaStream *iface, REFIID riid, void **out)
-@@ -798,16 +1082,32 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
+@@ -683,16 +961,30 @@ static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *
  }
  
  static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor,
@@ -400,9 +397,7 @@ index 5f203a946bc..d6ea8b52aca 100644
  
 -    return E_NOTIMPL;
 +    if (!(IsEqualIID(time_format, &GUID_NULL)))
-+    {
 +        return MF_E_UNSUPPORTED_TIME_FORMAT;
-+    }
 +
 +    if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_START, &command)))
 +    {
@@ -417,7 +412,7 @@ index 5f203a946bc..d6ea8b52aca 100644
  }
  
  static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface)
-@@ -876,6 +1176,9 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
+@@ -773,6 +1065,9 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface)
      if (source->no_more_pads_event)
          CloseHandle(source->no_more_pads_event);
  
@@ -427,7 +422,7 @@ index 5f203a946bc..d6ea8b52aca 100644
      return S_OK;
  }
  
-@@ -973,6 +1276,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -853,6 +1148,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          return E_OUTOFMEMORY;
  
      object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl;
@@ -435,7 +430,7 @@ index 5f203a946bc..d6ea8b52aca 100644
      object->ref = 1;
      object->byte_stream = bytestream;
      IMFByteStream_AddRef(bytestream);
-@@ -981,6 +1285,9 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -861,6 +1157,9 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
          goto fail;
  
@@ -445,6 +440,139 @@ index 5f203a946bc..d6ea8b52aca 100644
      object->container = gst_bin_new(NULL);
      object->bus = gst_bus_new();
      gst_bus_set_sync_handler(object->bus, mf_src_bus_watch_wrapper, object, NULL);
+diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
+index 2e8b0978648..43895c2cb5d 100644
+--- a/dlls/winegstreamer/mfplat.c
++++ b/dlls/winegstreamer/mfplat.c
+@@ -601,3 +601,128 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
+ 
+     return media_type;
+ }
++
++GstCaps *caps_from_mf_media_type(IMFMediaType *type)
++{
++    GUID major_type;
++    GUID subtype;
++    GstCaps *output = NULL;
++
++    if (FAILED(IMFMediaType_GetMajorType(type, &major_type)))
++        return NULL;
++    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
++        return NULL;
++
++    if (IsEqualGUID(&major_type, &MFMediaType_Video))
++    {
++        UINT64 frame_rate = 0, frame_size = 0;
++        DWORD width, height;
++        UINT32 unused;
++        GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
++        GUID subtype_base;
++        GstVideoInfo info;
++        unsigned int i;
++
++        if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
++            return NULL;
++        width = frame_size >> 32;
++        height = frame_size;
++
++        output = gst_caps_new_empty_simple("video/x-raw");
++
++        for (i = 0; i < ARRAY_SIZE(uncompressed_video_formats); i++)
++        {
++            if (IsEqualGUID(uncompressed_video_formats[i].subtype, &subtype))
++            {
++                format = uncompressed_video_formats[i].format;
++                break;
++            }
++        }
++
++        subtype_base = subtype;
++        subtype_base.Data1 = 0;
++        if (format == GST_VIDEO_FORMAT_UNKNOWN && IsEqualGUID(&MFVideoFormat_Base, &subtype_base))
++            format = gst_video_format_from_fourcc(subtype.Data1);
++
++        if (format == GST_VIDEO_FORMAT_UNKNOWN)
++        {
++            FIXME("Unrecognized format %s\n", debugstr_guid(&subtype));
++            return NULL;
++        }
++
++        gst_video_info_set_format(&info, format, width, height);
++        output = gst_video_info_to_caps(&info);
++
++        if (frame_size)
++        {
++            gst_caps_set_simple(output, "width", G_TYPE_INT, width, NULL);
++            gst_caps_set_simple(output, "height", G_TYPE_INT, height, NULL);
++        }
++        if (SUCCEEDED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &frame_rate)))
++            gst_caps_set_simple(output, "framerate", GST_TYPE_FRACTION, frame_rate >> 32, (DWORD32) frame_rate, NULL);
++        return output;
++    }
++    else if (IsEqualGUID(&major_type, &MFMediaType_Audio))
++    {
++        DWORD rate, channels, channel_mask, bitrate;
++
++        if (IsEqualGUID(&subtype, &MFAudioFormat_Float))
++        {
++            output = gst_caps_new_empty_simple("audio/x-raw");
++
++            gst_caps_set_simple(output, "format", G_TYPE_STRING, "F32LE", NULL);
++            gst_caps_set_simple(output, "layout", G_TYPE_STRING, "interleaved", NULL);
++        }
++        else if (IsEqualGUID(&subtype, &MFAudioFormat_PCM))
++        {
++            DWORD bits_per_sample;
++
++            if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &bits_per_sample)))
++            {
++                char format[6];
++                char type;
++
++                type = bits_per_sample > 8 ? 'S' : 'U';
++
++                output = gst_caps_new_empty_simple("audio/x-raw");
++
++                sprintf(format, "%c%u%s", type, bits_per_sample, bits_per_sample > 8 ? "LE" : "");
++
++                gst_caps_set_simple(output, "format", G_TYPE_STRING, format, NULL);
++            }
++            else
++            {
++                ERR("Bits per sample not set.\n");
++                return NULL;
++            }
++        }
++        else
++        {
++            FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
++            return NULL;
++        }
++
++        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
++        {
++            gst_caps_set_simple(output, "rate", G_TYPE_INT, rate, NULL);
++        }
++        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels)))
++        {
++            gst_caps_set_simple(output, "channels", G_TYPE_INT, channels, NULL);
++        }
++        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask)))
++        {
++            gst_caps_set_simple(output, "channel-mask", GST_TYPE_BITMASK, (guint64) channel_mask, NULL);
++        }
++
++        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AVG_BITRATE, &bitrate)))
++        {
++            gst_caps_set_simple(output, "bitrate", G_TYPE_INT, bitrate, NULL);
++        }
++
++        return output;
++    }
++
++    FIXME("Unrecognized major type %s\n", debugstr_guid(&major_type));
++    return NULL;
++}
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0006-winegstreamer-Implement-IMFMediaStream-RequestSample.patch

@@ -1,21 +1,21 @@
-From d6e46ad311f773daed7d065c5c46f55c430a544c Mon Sep 17 00:00:00 2001
+From 274fb99e0ecfbec3ef7e6d1b93c4fd5ed2c68529 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
-Date: Wed, 25 Mar 2020 10:43:03 -0500
+Date: Thu, 8 Oct 2020 16:39:53 -0500
 Subject: [PATCH] winegstreamer: Implement IMFMediaStream::RequestSample.
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/mfplat/tests/mfplat.c        |   4 --
- dlls/winegstreamer/gst_private.h  |   1 +
- dlls/winegstreamer/media_source.c | 108 +++++++++++++++++++++++++++++-
- dlls/winegstreamer/mfplat.c       |  90 +++++++++++++++++++++++++
- 4 files changed, 198 insertions(+), 5 deletions(-)
+ dlls/mfplat/tests/mfplat.c        |  4 --
+ dlls/winegstreamer/gst_private.h  |  1 +
+ dlls/winegstreamer/media_source.c | 92 ++++++++++++++++++++++++++++++-
+ dlls/winegstreamer/mfplat.c       | 69 +++++++++++++++++++++++
+ 4 files changed, 161 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
-index e6a1694a11f..6dd2c3cbe96 100644
+index ef9837c0a8a..572cb8dec9a 100644
 --- a/dlls/mfplat/tests/mfplat.c
 +++ b/dlls/mfplat/tests/mfplat.c
-@@ -622,13 +622,10 @@ static void test_source_resolver(void)
+@@ -623,13 +623,10 @@ todo_wine
          hr = IMFMediaStream_RequestSample(video_stream, NULL);
          if (i == sample_count)
              break;
@@ -29,7 +29,7 @@ index e6a1694a11f..6dd2c3cbe96 100644
  
      for (i = 0; i < sample_count; ++i)
      {
-@@ -669,7 +666,6 @@ todo_wine
+@@ -670,7 +667,6 @@ todo_wine
  
      get_event((IMFMediaEventGenerator *)mediasource, MEEndOfPresentation, NULL);
  
@@ -38,11 +38,11 @@ index e6a1694a11f..6dd2c3cbe96 100644
      IMFMediaTypeHandler_Release(handler);
      IMFPresentationDescriptor_Release(descriptor);
 diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 00e28f1d092..df1e643c3f6 100644
+index 07556802a51..ff5aff42482 100644
 --- a/dlls/winegstreamer/gst_private.h
 +++ b/dlls/winegstreamer/gst_private.h
-@@ -59,6 +59,7 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HI
- GstCaps *make_mf_compatible_caps(GstCaps *caps) DECLSPEC_HIDDEN;
+@@ -58,6 +58,7 @@ extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj)
+ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) 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;
@@ -50,10 +50,16 @@ index 00e28f1d092..df1e643c3f6 100644
  HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
  
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index d6ea8b52aca..31f90443ee4 100644
+index 70c5b47ba84..a67f1cb71d7 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -64,6 +64,7 @@ struct media_stream
+@@ -58,11 +58,13 @@ struct media_stream
+         STREAM_RUNNING,
+     } state;
+     DWORD stream_id;
++    BOOL eos;
+ };
+ 
  enum source_async_op
  {
      SOURCE_ASYNC_START,
@@ -61,7 +67,7 @@ index d6ea8b52aca..31f90443ee4 100644
  };
  
  struct source_async_command
-@@ -79,6 +80,11 @@ struct source_async_command
+@@ -78,6 +80,11 @@ struct source_async_command
              GUID format;
              PROPVARIANT position;
          } start;
@@ -73,16 +79,26 @@ index d6ea8b52aca..31f90443ee4 100644
      } u;
  };
  
-@@ -338,6 +344,78 @@ static HRESULT start_pipeline(struct media_source *source, struct source_async_c
-     return S_OK;
+@@ -311,6 +318,8 @@ static void start_pipeline(struct media_source *source, struct source_async_comm
+             GstSample *preroll;
+ 
+             gst_pad_push_event(stream->my_sink, seek_event);
++
++            stream->eos = FALSE;
+         }
+ 
+         if (selected)
+@@ -334,6 +343,59 @@ static void start_pipeline(struct media_source *source, struct source_async_comm
+     gst_element_set_state(source->container, GST_STATE_PLAYING);
  }
  
 +static void dispatch_end_of_presentation(struct media_source *source)
 +{
 +    PROPVARIANT empty = {.vt = VT_EMPTY};
++    unsigned int i;
 +
 +    /* A stream has ended, check whether all have */
-+    for (unsigned int i = 0; i < source->stream_count; i++)
++    for (i = 0; i < source->stream_count; i++)
 +    {
 +        struct media_stream *stream = source->streams[i];
 +
@@ -93,7 +109,7 @@ index d6ea8b52aca..31f90443ee4 100644
 +    IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MEEndOfPresentation, &GUID_NULL, S_OK, &empty);
 +}
 +
-+static HRESULT wait_on_sample(struct media_stream *stream, IUnknown *token)
++static void wait_on_sample(struct media_stream *stream, IUnknown *token)
 +{
 +    PROPVARIANT empty_var = {.vt = VT_EMPTY};
 +    GstSample *gst_sample;
@@ -107,24 +123,7 @@ index d6ea8b52aca..31f90443ee4 100644
 +    {
 +        buffer = gst_sample_get_buffer(gst_sample);
 +
-+        if (TRACE_ON(mfplat))
-+        {
-+            const GstCaps *sample_caps = gst_sample_get_caps(gst_sample);
-+            const GstStructure *sample_info = gst_sample_get_info(gst_sample);
-+            if (sample_caps)
-+            {
-+                gchar *sample_caps_str = gst_caps_to_string(sample_caps);
-+                TRACE("sample caps %s\n", debugstr_a(sample_caps_str));
-+                g_free(sample_caps_str);
-+            }
-+            if (sample_info)
-+            {
-+                gchar *sample_info_str = gst_structure_to_string(sample_info);
-+                TRACE("sample info %s\n", debugstr_a(sample_info_str));
-+                g_free(sample_info_str);
-+            }
-+            TRACE("PTS = %lu DTS = %lu\n", GST_BUFFER_PTS(buffer), GST_BUFFER_DTS(buffer));
-+        }
++        TRACE("PTS = %llu\n", (unsigned long long int) GST_BUFFER_PTS(buffer));
 +
 +        sample = mf_sample_from_gst_buffer(buffer);
 +        gst_sample_unref(gst_sample);
@@ -143,26 +142,23 @@ index d6ea8b52aca..31f90443ee4 100644
 +            IUnknown_Release(token);
 +        IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEEndOfStream, &GUID_NULL, S_OK, &empty_var);
 +        dispatch_end_of_presentation(stream->parent_source);
-+        return S_OK;
 +    }
-+
-+    return S_OK;
 +}
 +
  static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)
  {
      struct media_source *source = impl_from_async_commands_callback_IMFAsyncCallback(iface);
-@@ -357,6 +435,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA
+@@ -353,6 +415,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA
          case SOURCE_ASYNC_START:
              start_pipeline(source, command);
              break;
 +        case SOURCE_ASYNC_REQUEST_SAMPLE:
 +            wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token);
 +            break;
-         default:
-             ;
      }
-@@ -665,13 +746,37 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM
+ 
+     IUnknown_Release(state);
+@@ -640,13 +705,37 @@ static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IM
  static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown *token)
  {
      struct media_stream *stream = impl_from_IMFMediaStream(iface);
@@ -193,7 +189,7 @@ index d6ea8b52aca..31f90443ee4 100644
 +            IUnknown_AddRef(token);
 +        command->u.request_sample.token = token;
 +
-+        /* Once pause support is added, this will need to into a stream queue, and synchronization will need to be added*/
++        /* Once pause support is added, this will need to put into a stream queue, and synchronization will need to be added*/
 +        hr = MFPutWorkItem(stream->parent_source->async_commands_queue, &stream->parent_source->async_commands_callback, &command->IUnknown_iface);
 +    }
 +
@@ -201,7 +197,7 @@ index d6ea8b52aca..31f90443ee4 100644
  }
  
  static const IMFMediaStreamVtbl media_stream_vtbl =
-@@ -843,6 +948,7 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD
+@@ -729,6 +818,7 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD
      object->stream_id = stream_id;
  
      object->state = STREAM_INACTIVE;
@@ -210,10 +206,10 @@ index d6ea8b52aca..31f90443ee4 100644
      if (FAILED(hr = MFCreateEventQueue(&object->event_queue)))
          goto fail;
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 4b7a9760688..ce0c951ac0d 100644
+index 43895c2cb5d..e50fd2e04ab 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1239,3 +1239,93 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -726,3 +726,72 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
      FIXME("Unrecognized major type %s\n", debugstr_guid(&major_type));
      return NULL;
  }
@@ -229,83 +225,62 @@ index 4b7a9760688..ce0c951ac0d 100644
 +
 +IMFSample* mf_sample_from_gst_buffer(GstBuffer *gst_buffer)
 +{
-+    IMFSample *out = NULL;
++    IMFMediaBuffer *mf_buffer = NULL;
++    GstMapInfo map_info = {0};
 +    LONGLONG duration, time;
-+    int buffer_count;
++    BYTE *mapped_buf = NULL;
++    IMFSample *out = NULL;
 +    HRESULT hr;
 +
 +    if (FAILED(hr = MFCreateSample(&out)))
-+        goto fail;
++        goto done;
 +
 +    duration = GST_BUFFER_DURATION(gst_buffer);
 +    time = GST_BUFFER_PTS(gst_buffer);
 +
-+    if (FAILED(IMFSample_SetSampleDuration(out, duration / 100)))
-+        goto fail;
++    if (FAILED(hr = IMFSample_SetSampleDuration(out, duration / 100)))
++        goto done;
 +
-+    if (FAILED(IMFSample_SetSampleTime(out, time / 100)))
-+        goto fail;
++    if (FAILED(hr = IMFSample_SetSampleTime(out, time / 100)))
++        goto done;
 +
-+    buffer_count = gst_buffer_n_memory(gst_buffer);
-+
-+    for (unsigned int i = 0; i < buffer_count; i++)
++    if (!gst_buffer_map(gst_buffer, &map_info, GST_MAP_READ))
 +    {
-+        GstMemory *memory = gst_buffer_get_memory(gst_buffer, i);
-+        IMFMediaBuffer *mf_buffer = NULL;
-+        GstMapInfo map_info;
-+        BYTE *buf_data;
++        hr = E_FAIL;
++        goto done;
++    }
 +
-+        if (!memory)
-+        {
-+            hr = E_FAIL;
-+            goto loop_done;
-+        }
++    if (FAILED(hr = MFCreateMemoryBuffer(map_info.maxsize, &mf_buffer)))
++        goto done;
 +
-+        if (!(gst_memory_map(memory, &map_info, GST_MAP_READ)))
-+        {
-+            hr = E_FAIL;
-+            goto loop_done;
-+        }
++    if (FAILED(hr = IMFMediaBuffer_Lock(mf_buffer, &mapped_buf, NULL, NULL)))
++        goto done;
 +
-+        if (FAILED(hr = MFCreateMemoryBuffer(map_info.maxsize, &mf_buffer)))
-+        {
-+            gst_memory_unmap(memory, &map_info);
-+            goto loop_done;
-+        }
++    memcpy(mapped_buf, map_info.data, map_info.size);
 +
-+        if (FAILED(hr = IMFMediaBuffer_Lock(mf_buffer, &buf_data, NULL, NULL)))
-+        {
-+            gst_memory_unmap(memory, &map_info);
-+            goto loop_done;
-+        }
++    if (FAILED(hr = IMFMediaBuffer_Unlock(mf_buffer)))
++        goto done;
 +
-+        memcpy(buf_data, map_info.data, map_info.size);
++    if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(mf_buffer, map_info.size)))
++        goto done;
 +
-+        gst_memory_unmap(memory, &map_info);
++    if (FAILED(hr = IMFSample_AddBuffer(out, mf_buffer)))
++        goto done;
 +
-+        if (FAILED(hr = IMFMediaBuffer_Unlock(mf_buffer)))
-+            goto loop_done;
-+
-+        if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(mf_buffer, map_info.size)))
-+            goto loop_done;
-+
-+        if (FAILED(hr = IMFSample_AddBuffer(out, mf_buffer)))
-+            goto loop_done;
-+
-+        loop_done:
-+        if (mf_buffer)
-+            IMFMediaBuffer_Release(mf_buffer);
-+        if (memory)
-+            gst_memory_unref(memory);
-+        if (FAILED(hr))
-+            goto fail;
++done:
++    if (mf_buffer)
++        IMFMediaBuffer_Release(mf_buffer);
++    if (map_info.data)
++        gst_buffer_unmap(gst_buffer, &map_info);
++    if (FAILED(hr))
++    {
++        ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr);
++        if (out)
++            IMFSample_Release(out);
++        out = NULL;
 +    }
 +
 +    return out;
-+    fail:
-+    ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr);
-+    IMFSample_Release(out);
-+    return NULL;
 +}
 -- 
 2.28.0

patches/mfplat-streaming-support/0007-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch

@@ -1,4 +1,4 @@
-From 073dde743ea2fe54e93c50ea24bb83c59adaddd1 Mon Sep 17 00:00:00 2001
+From 686c650852f1af5d9aa3197887325472210d2014 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
@@ -7,12 +7,12 @@ Subject: [PATCH] winegstreamer: Insert parser into pipeline to rectify type
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
  dlls/winegstreamer/gst_private.h  |   1 +
- dlls/winegstreamer/media_source.c | 149 +++++++++++++++++++++++++++++-
- dlls/winegstreamer/mfplat.c       |  22 +++++
- 3 files changed, 169 insertions(+), 3 deletions(-)
+ dlls/winegstreamer/media_source.c | 111 ++++++++++++++++++++++++++++--
+ dlls/winegstreamer/mfplat.c       |  22 ++++++
+ 3 files changed, 130 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 60b38a48f5a..7ec71d40800 100644
+index ff5aff42482..df1e643c3f6 100644
 --- a/dlls/winegstreamer/gst_private.h
 +++ b/dlls/winegstreamer/gst_private.h
 @@ -56,6 +56,7 @@ void start_dispatch_thread(void) DECLSPEC_HIDDEN;
@@ -21,16 +21,18 @@ index 60b38a48f5a..7ec71d40800 100644
  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;
- 
- HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) 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 29947e1554f..92b4100f7bc 100644
+index a67f1cb71d7..c72ac064518 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -403,6 +403,122 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
+@@ -752,8 +752,17 @@ static const IMFMediaStreamVtbl media_stream_vtbl =
      media_stream_RequestSample
  };
  
+-/* Setup a chain of elements which should hopefully allow transformations to any IMFMediaType
+-   the user throws at us through gstreamer's caps negotiation. */
 +/* There are two paths this function can take.
 +   1) In the first path, we are acting as a real media source, purely demuxing the input data,
 +      in whichever format it may be in, and passing it along.  However, there can be different ways
@@ -42,43 +44,23 @@ index 29947e1554f..92b4100f7bc 100644
 +   2) In the second path, we are dealing with x-raw output from decodebin.  In this case, we just
 +      have to setup a chain of elements which should hopefully allow transformations to any IMFMediaType
 +      the user throws at us through gstreamer's caps negotiation.*/
-+static HRESULT media_stream_align_with_mf(struct media_stream *stream)
-+{
-+    GstCaps *source_caps = NULL;
-+    GstCaps *target_caps = NULL;
-+    HRESULT hr = E_FAIL;
-+
-+    if (!(source_caps = gst_pad_query_caps(stream->their_src, NULL)))
-+        goto done;
-+
-+    if (TRACE_ON(mfplat))
-+    {
-+        gchar *source_caps_str = gst_caps_to_string(source_caps);
-+        TRACE("source caps %s\n", debugstr_a(source_caps_str));
-+        g_free(source_caps_str);
-+    }
-+
-+    if (!strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "video/x-raw") ||
-+        !strcmp(gst_structure_get_name(gst_caps_get_structure(source_caps, 0)), "audio/x-raw"))
-+    {
-+        stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
-+        g_object_set(stream->appsink, "caps", source_caps, NULL);
-+        assert(gst_pad_link(stream->their_src, stream->my_sink) == GST_PAD_LINK_OK);
-+    }
-+    else
-+    {
+ 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)
+     }
+     else
+     {
+-        stream->my_sink = gst_element_get_static_pad(stream->appsink, "sink");
 +        GstElement *parser = NULL;
++        GstCaps *target_caps;
 +
 +        assert(gst_caps_is_fixed(source_caps));
 +
 +        if (!(target_caps = make_mf_compatible_caps(source_caps)))
-+            goto done;
-+
-+        if (TRACE_ON(mfplat))
 +        {
-+            gchar *target_caps_str = gst_caps_to_string(target_caps);
-+            TRACE("target caps %s\n", debugstr_a(target_caps_str));
-+            g_free(target_caps_str);
++            gst_caps_unref(source_caps);
++            return E_FAIL;
 +        }
 +
 +        g_object_set(stream->appsink, "caps", target_caps, NULL);
@@ -97,13 +79,14 @@ index 29947e1554f..92b4100f7bc 100644
 +            parser_list_two = gst_element_factory_list_filter(parser_list_one, target_caps, GST_PAD_SRC, 0);
 +            gst_plugin_feature_list_free(parser_list_one);
 +            parser_list_one = parser_list_two;
++            gst_caps_unref(target_caps);
 +
 +            if (!(g_list_length(parser_list_one)))
 +            {
 +                gst_plugin_feature_list_free(parser_list_one);
 +                ERR("Failed to find parser for stream\n");
-+                hr = E_FAIL;
-+                goto done;
++                gst_caps_unref(source_caps);
++                return E_FAIL;
 +            }
 +
 +            parser_factory = g_list_first(parser_list_one)->data;
@@ -115,70 +98,56 @@ index 29947e1554f..92b4100f7bc 100644
 +
 +            if (!parser)
 +            {
-+                hr = E_FAIL;
-+                goto done;
++                gst_caps_unref(source_caps);
++                return E_FAIL;
 +            }
 +
 +            gst_bin_add(GST_BIN(stream->parent_source->container), parser);
 +
-+            assert(gst_pad_link(stream->their_src, gst_element_get_static_pad(parser, "sink")) == GST_PAD_LINK_OK);
-+
 +            assert(gst_element_link(parser, stream->appsink));
 +
 +            gst_element_sync_state_with_parent(parser);
 +        }
 +        else
 +        {
-+            assert(gst_pad_link(stream->their_src, gst_element_get_static_pad(stream->appsink, "sink")) == GST_PAD_LINK_OK);
++            gst_caps_unref(target_caps);
 +        }
 +
 +        stream->my_sink = gst_element_get_static_pad(parser ? parser : stream->appsink, "sink");
-+    }
-+
-+    hr = S_OK;
-+
-+    done:
-+    if (source_caps)
-+        gst_caps_unref(source_caps);
-+    if (target_caps)
-+        gst_caps_unref(target_caps);
-+
-+    return hr;
-+}
-+
-+
- static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD stream_id, struct media_stream **out_stream)
- {
-     struct media_stream *object = heap_alloc_zero(sizeof(*object));
-@@ -433,8 +549,7 @@ static HRESULT new_media_stream(struct media_source *source, GstPad *pad, DWORD
-     g_object_set(object->appsink, "sync", FALSE, NULL);
-     g_object_set(object->appsink, "max-buffers", 5, NULL);
+     }
  
--    object->my_sink = gst_element_get_static_pad(object->appsink, "sink");
--    gst_pad_link(object->their_src, object->my_sink);
-+    media_stream_align_with_mf(object);
- 
-     gst_element_sync_state_with_parent(object->appsink);
- 
-@@ -457,7 +572,16 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-     IMFMediaType *stream_type = NULL;
-     HRESULT hr;
- 
--    stream_type = mf_media_type_from_caps(current_caps);
-+    if (strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw") &&
-+        strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "audio/x-raw"))
+     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);
-+        stream_type = mf_media_type_from_caps(compatible_caps);
-+        gst_caps_unref(compatible_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;
++            }
++        }
 +    }
-+    else
-+        stream_type = mf_media_type_from_caps(current_caps);
-+
-     gst_caps_unref(current_caps);
-     if (!stream_type)
-         return E_FAIL;
-@@ -687,6 +811,23 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
+ 
+     if (!type_count)
+     {
+@@ -1178,6 +1262,23 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
      media_source_Shutdown,
  };
  
@@ -202,7 +171,7 @@ index 29947e1554f..92b4100f7bc 100644
  static void stream_added(GstElement *element, GstPad *pad, gpointer user)
  {
      struct media_source *source = user;
-@@ -787,6 +928,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1283,6 +1384,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
  
      gst_bin_add(GST_BIN(object->container), object->decodebin);
  
@@ -212,14 +181,13 @@ index 29947e1554f..92b4100f7bc 100644
      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 2e8b0978648..a67cdef72fe 100644
+index e50fd2e04ab..6e1248ef0bd 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -601,3 +601,25 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)
- 
+@@ -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;
@@ -241,6 +209,10 @@ index 2e8b0978648..a67cdef72fe 100644
 +
 +    return ret;
 +}
++
+ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+ {
+     GUID major_type;
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0008-winegstreamer-Translate-H.264-caps-to-attributes.patch

@@ -1,4 +1,4 @@
-From 3a0e2a85e06e2026a430fe548374f36b9be7a53b Mon Sep 17 00:00:00 2001
+From b472ddc94d02fdb30fbf2e848abf544343bc78ae 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.
@@ -9,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 80 insertions(+)
 
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index a67cdef72fe..97b02d85a5d 100644
+index 6e1248ef0bd..f23817cee73 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -26,6 +26,7 @@

patches/mfplat-streaming-support/0009-winegstreamer-Translate-WMV-caps-to-attributes.patch

@@ -1,4 +1,4 @@
-From 3abc720777969b80c82c8e19215d765e4ddca913 Mon Sep 17 00:00:00 2001
+From 726d3d6d9e7d4c836f57d58d95a6135a4c35dda7 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.
@@ -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 97b02d85a5d..1ef86a3cff5 100644
+index f23817cee73..44d27594509 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -457,6 +457,24 @@ uncompressed_video_formats[] =

patches/mfplat-streaming-support/0010-winegstreamer-Introduce-IMFMediaType-GstCaps-convert.patch

@@ -1,183 +0,0 @@
-From 04d17547828174ec264284752eb65b1b1e1b942d Mon Sep 17 00:00:00 2001
-From: Derek Lesho <dlesho@codeweavers.com>
-Date: Tue, 24 Mar 2020 16:15:35 -0500
-Subject: [PATCH] winegstreamer: Introduce IMFMediaType -> GstCaps converter.
-
-Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
----
- dlls/winegstreamer/gst_private.h |   1 +
- dlls/winegstreamer/mfplat.c      | 149 +++++++++++++++++++++++++++++++
- 2 files changed, 150 insertions(+)
-
-diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
-index 7ec71d40800..00e28f1d092 100644
---- a/dlls/winegstreamer/gst_private.h
-+++ b/dlls/winegstreamer/gst_private.h
-@@ -58,6 +58,7 @@ extern HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj)
- 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;
- 
- HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj) DECLSPEC_HIDDEN;
- 
-diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 4aedfea45e0..f0b611e7ef5 100644
---- a/dlls/winegstreamer/mfplat.c
-+++ b/dlls/winegstreamer/mfplat.c
-@@ -902,3 +902,152 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
- 
-     return ret;
- }
-+
-+GstCaps *caps_from_mf_media_type(IMFMediaType *type)
-+{
-+    GUID major_type;
-+    GUID subtype;
-+    GstCaps *output = NULL;
-+
-+    if (FAILED(IMFMediaType_GetMajorType(type, &major_type)))
-+        return NULL;
-+    if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)))
-+        return NULL;
-+
-+    if (IsEqualGUID(&major_type, &MFMediaType_Video))
-+    {
-+        UINT64 frame_rate = 0, frame_size = 0;
-+        DWORD width, height, framerate_num, framerate_den;
-+        UINT32 unused;
-+
-+        if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
-+            return NULL;
-+        width = frame_size >> 32;
-+        height = frame_size;
-+        if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_RATE, &frame_rate)))
-+        {
-+            frame_rate = TRUE;
-+            framerate_num = 0;
-+            framerate_den = 1;
-+        }
-+        else
-+        {
-+            framerate_num = frame_rate >> 32;
-+            framerate_den = frame_rate;
-+        }
-+
-+        /* Check if type is uncompressed */
-+        if (SUCCEEDED(MFCalculateImageSize(&subtype, 100, 100, &unused)))
-+        {
-+            GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
-+            unsigned int i;
-+
-+            output = gst_caps_new_empty_simple("video/x-raw");
-+
-+            for (i = 0; i < ARRAY_SIZE(uncompressed_video_formats); i++)
-+            {
-+                if (IsEqualGUID(uncompressed_video_formats[i].subtype, &subtype))
-+                {
-+                    format = uncompressed_video_formats[i].format;
-+                    break;
-+                }
-+            }
-+
-+            if (format == GST_VIDEO_FORMAT_UNKNOWN)
-+            {
-+                format = gst_video_format_from_fourcc(subtype.Data1);
-+            }
-+
-+            if (format == GST_VIDEO_FORMAT_UNKNOWN)
-+            {
-+                FIXME("Unrecognized format %s\n", debugstr_guid(&subtype));
-+                return NULL;
-+            }
-+            else
-+            {
-+                GstVideoInfo info;
-+
-+                gst_video_info_set_format(&info, format, width, height);
-+                output = gst_video_info_to_caps(&info);
-+            }
-+
-+        }
-+        else {
-+            FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
-+            return NULL;
-+        }
-+
-+
-+        if (frame_size)
-+        {
-+            gst_caps_set_simple(output, "width", G_TYPE_INT, width, NULL);
-+            gst_caps_set_simple(output, "height", G_TYPE_INT, height, NULL);
-+        }
-+        if (frame_rate)
-+            gst_caps_set_simple(output, "framerate", GST_TYPE_FRACTION, framerate_num, framerate_den, NULL);
-+        return output;
-+    }
-+    else if (IsEqualGUID(&major_type, &MFMediaType_Audio))
-+    {
-+        DWORD rate, channels, channel_mask, bitrate;
-+
-+        if (IsEqualGUID(&subtype, &MFAudioFormat_Float))
-+        {
-+            output = gst_caps_new_empty_simple("audio/x-raw");
-+
-+            gst_caps_set_simple(output, "format", G_TYPE_STRING, "F32LE", NULL);
-+            gst_caps_set_simple(output, "layout", G_TYPE_STRING, "interleaved", NULL);
-+        }
-+        else if (IsEqualGUID(&subtype, &MFAudioFormat_PCM))
-+        {
-+            DWORD bits_per_sample;
-+
-+            if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &bits_per_sample)))
-+            {
-+                char format[6];
-+                char type;
-+
-+                type = bits_per_sample > 8 ? 'S' : 'U';
-+
-+                output = gst_caps_new_empty_simple("audio/x-raw");
-+
-+                sprintf(format, "%c%u%s", type, bits_per_sample, bits_per_sample > 8 ? "LE" : "");
-+
-+                gst_caps_set_simple(output, "format", G_TYPE_STRING, format, NULL);
-+            }
-+            else
-+            {
-+                ERR("Bits per sample not set.\n");
-+                return NULL;
-+            }
-+        }
-+        else
-+        {
-+            FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
-+            return NULL;
-+        }
-+
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate)))
-+        {
-+            gst_caps_set_simple(output, "rate", G_TYPE_INT, rate, NULL);
-+        }
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels)))
-+        {
-+            gst_caps_set_simple(output, "channels", G_TYPE_INT, channels, NULL);
-+        }
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, &channel_mask)))
-+        {
-+            gst_caps_set_simple(output, "channel-mask", GST_TYPE_BITMASK, (guint64) channel_mask, NULL);
-+        }
-+
-+        if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_AVG_BITRATE, &bitrate)))
-+        {
-+            gst_caps_set_simple(output, "bitrate", G_TYPE_INT, bitrate, NULL);
-+        }
-+
-+        return output;
-+    }
-+
-+    FIXME("Unrecognized major type %s\n", debugstr_guid(&major_type));
-+    return NULL;
-+}
--- 
-2.28.0
-

patches/mfplat-streaming-support/0010-winegstreamer-Translate-AAC-caps-to-attributes.patch

@@ -1,4 +1,4 @@
-From 0a7b4fe24117d2c9e782b046819ffa7d3e646ae4 Mon Sep 17 00:00:00 2001
+From d6e9efab74da3fc8d64b84d60b043d663e09b0ad 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.
@@ -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 1ef86a3cff5..9239cf9eff9 100644
+index 44d27594509..4fa37ab66d4 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -457,6 +457,15 @@ uncompressed_video_formats[] =

patches/mfplat-streaming-support/0011-winegstreamer-Translate-MPEG-4-Section-2-caps-to-att.patch

@@ -1,4 +1,4 @@
-From ae279be0b4841c998dfa916f61f5bd7507190938 Mon Sep 17 00:00:00 2001
+From 16c6008bab9df24367556daa7c3f8e82a3cd1336 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.
@@ -9,7 +9,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 9239cf9eff9..4fde3a8a7fb 100644
+index 4fa37ab66d4..b3bac362cf6 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -650,6 +650,22 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)

patches/mfplat-streaming-support/0012-winegstreamer-Translate-WMA-caps-to-attributes.patch

@@ -1,4 +1,4 @@
-From 2010fec0d85988d7a0b7aaadd6438e1d5c727e4a Mon Sep 17 00:00:00 2001
+From b85bb396862a124034c138c52c3da5511c3a82da 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.
@@ -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 4fde3a8a7fb..4aedfea45e0 100644
+index b3bac362cf6..dea56839647 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -830,6 +830,30 @@ IMFMediaType *mf_media_type_from_caps(const GstCaps *caps)

patches/mfplat-streaming-support/0013-winegstreamer-Translate-H.264-attributes-to-caps.patch

@@ -1,23 +1,36 @@
-From 3e0c22f47b91d130d1e136fa3282cbed1f275f0a Mon Sep 17 00:00:00 2001
+From 9fd2109de96d5804403fa21ea61bb1a429b72090 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.
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
- dlls/winegstreamer/mfplat.c | 48 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
+ dlls/winegstreamer/mfplat.c | 90 +++++++++++++++++++++++++++++--------
+ 1 file changed, 71 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index f0b611e7ef5..7370ae26f4f 100644
+index dea56839647..8461e8af01f 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -972,6 +972,54 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
-             }
+@@ -919,10 +919,6 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+         UINT64 frame_rate = 0, frame_size = 0;
+         DWORD width, height;
+         UINT32 unused;
+-        GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
+-        GUID subtype_base;
+-        GstVideoInfo info;
+-        unsigned int i;
  
-         }
-+        else if (IsEqualGUID(&subtype, &MFVideoFormat_H264))
-+        {
+         if (FAILED(IMFMediaType_GetUINT64(type, &MF_MT_FRAME_SIZE, &frame_size)))
+             return NULL;
+@@ -931,28 +927,84 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+ 
+         output = gst_caps_new_empty_simple("video/x-raw");
+ 
+-        for (i = 0; i < ARRAY_SIZE(uncompressed_video_formats); i++)
++        if (IsEqualGUID(&subtype, &MFVideoFormat_H264))
+         {
+-            if (IsEqualGUID(uncompressed_video_formats[i].subtype, &subtype))
 +            enum eAVEncH264VProfile h264_profile;
 +            enum eAVEncH264VLevel h264_level;
 +            output = gst_caps_new_empty_simple("video/x-h264");
@@ -38,7 +51,9 @@ index f0b611e7ef5..7370ae26f4f 100644
 +                    gst_caps_set_simple(output, "profile", G_TYPE_STRING, profile, NULL);
 +            }
 +            if (SUCCEEDED(IMFMediaType_GetUINT32(type, &MF_MT_MPEG2_LEVEL, &h264_level)))
-+            {
+             {
+-                format = uncompressed_video_formats[i].format;
+-                break;
 +                const char *level = NULL;
 +                switch (h264_level)
 +                {
@@ -62,11 +77,52 @@ index f0b611e7ef5..7370ae26f4f 100644
 +                }
 +                if (level)
 +                    gst_caps_set_simple(output, "level", G_TYPE_STRING, level, NULL);
+             }
+         }
++        else
++        {
++            GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
++            GUID subtype_base;
++            GstVideoInfo info;
++            unsigned int i;
+ 
+-        subtype_base = subtype;
+-        subtype_base.Data1 = 0;
+-        if (format == GST_VIDEO_FORMAT_UNKNOWN && IsEqualGUID(&MFVideoFormat_Base, &subtype_base))
+-            format = gst_video_format_from_fourcc(subtype.Data1);
++            for (i = 0; i < ARRAY_SIZE(uncompressed_video_formats); i++)
++            {
++                if (IsEqualGUID(uncompressed_video_formats[i].subtype, &subtype))
++                {
++                    format = uncompressed_video_formats[i].format;
++                    break;
++                }
 +            }
+ 
+-        if (format == GST_VIDEO_FORMAT_UNKNOWN)
+-        {
+-            FIXME("Unrecognized format %s\n", debugstr_guid(&subtype));
+-            return NULL;
+-        }
++            subtype_base = subtype;
++            subtype_base.Data1 = 0;
++            if (format == GST_VIDEO_FORMAT_UNKNOWN && IsEqualGUID(&MFVideoFormat_Base, &subtype_base))
++                format = gst_video_format_from_fourcc(subtype.Data1);
+ 
+-        gst_video_info_set_format(&info, format, width, height);
+-        output = gst_video_info_to_caps(&info);
++            if (format == GST_VIDEO_FORMAT_UNKNOWN)
++            {
++                FIXME("Unrecognized format %s\n", debugstr_guid(&subtype));
++                return NULL;
++            }
++
++            gst_video_info_set_format(&info, format, width, height);
++            output = gst_video_info_to_caps(&info);
 +        }
-         else {
-             FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
-             return NULL;
+ 
+         if (frame_size)
+         {
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0014-winegstreamer-Translate-WMV-attributes-to-caps.patch

@@ -1,4 +1,4 @@
-From dc5b390262d808615e4b49eb86286d2f6a6f41b1 Mon Sep 17 00:00:00 2001
+From d71b47eeac4b775c12c0670340559e57b683569d 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.
@@ -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 7370ae26f4f..5779f81ce39 100644
+index 8461e8af01f..9b495d52659 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -903,6 +903,21 @@ GstCaps *make_mf_compatible_caps(GstCaps *caps)
@@ -34,7 +34,7 @@ index 7370ae26f4f..5779f81ce39 100644
  GstCaps *caps_from_mf_media_type(IMFMediaType *type)
  {
      GUID major_type;
-@@ -1020,6 +1035,42 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -975,6 +990,42 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                      gst_caps_set_simple(output, "level", G_TYPE_STRING, level, NULL);
              }
          }
@@ -74,9 +74,9 @@ index 7370ae26f4f..5779f81ce39 100644
 +
 +            user_data_to_codec_data(type, output);
 +        }
-         else {
-             FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
-             return NULL;
+         else
+         {
+             GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0015-winegstreamer-Translate-AAC-attributes-to-caps.patch

@@ -1,4 +1,4 @@
-From f710ed4264cc6fb8c9ad1ffe15345c24e2d72aef Mon Sep 17 00:00:00 2001
+From 52eb35e32aecd3e1cae54109580495a8502dca45 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.
@@ -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 5779f81ce39..58d23a9ac15 100644
+index 9b495d52659..9b75a709168 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1120,6 +1120,72 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1100,6 +1100,72 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                  return NULL;
              }
          }

patches/mfplat-streaming-support/0016-winegstreamer-Translate-MPEG-4-Section-2-attributes-.patch

@@ -1,4 +1,4 @@
-From 7b3b63b25476f97aa1aad6636df47d6f540a52b3 Mon Sep 17 00:00:00 2001
+From fea795145aa7b64bbdc99a79c162226d1caa1c77 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.
@@ -9,10 +9,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 58d23a9ac15..a6230121cbf 100644
+index 9b75a709168..bd2a0ed1cb2 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1071,6 +1071,14 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1026,6 +1026,14 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
  
              user_data_to_codec_data(type, output);
          }
@@ -24,9 +24,9 @@ index 58d23a9ac15..a6230121cbf 100644
 +
 +            user_data_to_codec_data(type, output);
 +        }
-         else {
-             FIXME("Unrecognized subtype %s\n", debugstr_guid(&subtype));
-             return NULL;
+         else
+         {
+             GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
 -- 
 2.28.0
 

patches/mfplat-streaming-support/0017-winegstreamer-Translate-WMA-attributes-to-caps.patch

@@ -1,4 +1,4 @@
-From a8f54c1e644fcb185d3a6e3fc7b3e5e79a8b17d8 Mon Sep 17 00:00:00 2001
+From b96411942630ad39796166ebb615871dd0c8f082 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.
@@ -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 a6230121cbf..4b7a9760688 100644
+index bd2a0ed1cb2..ac1fa67da6e 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1194,6 +1194,21 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
+@@ -1174,6 +1174,21 @@ GstCaps *caps_from_mf_media_type(IMFMediaType *type)
                  CoTaskMemFree(user_data);
              }
          }

patches/mfplat-streaming-support/0018-winegstreamer-Implement-IMFMediaSource-GetCharacteri.patch

@@ -1,4 +1,4 @@
-From d3687d998fc5cc3ef11d53554e42c591905ffae2 Mon Sep 17 00:00:00 2001
+From e67fd844390a2c32e96a6bfdc0699f34df60480c Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 31 Mar 2020 15:15:07 -0500
 Subject: [PATCH] winegstreamer: Implement IMFMediaSource::GetCharacteristics.
@@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 31f90443ee4..536f0e5e140 100644
+index c72ac064518..2d00ca7e901 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1160,12 +1160,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO
+@@ -1114,12 +1114,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO
  {
      struct media_source *source = impl_from_IMFMediaSource(iface);
  

patches/mfplat-streaming-support/0019-winegstreamer-Calculate-the-MF_PD_DURATION-of-the-me.patch

@@ -1,4 +1,4 @@
-From 96232a45c5c32781ace6d14196e5c88603ad831f Mon Sep 17 00:00:00 2001
+From 541159bd92669732b4d7fce1cc3eda302ebdbfd8 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 31 Mar 2020 15:15:50 -0500
 Subject: [PATCH] winegstreamer: Calculate the MF_PD_DURATION of the media
@@ -10,10 +10,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 40 insertions(+)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 536f0e5e140..ff6b7c8eac9 100644
+index 2d00ca7e901..e1b018b74ce 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1488,6 +1488,46 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1445,6 +1445,46 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      heap_free(descriptors);
      descriptors = NULL;
  

patches/mfplat-streaming-support/0020-tools-Add-support-for-multiple-parent-directories.patch

@@ -1,4 +1,4 @@
-From c19ab97e7f9261b231d34a37999174d670cfafd3 Mon Sep 17 00:00:00 2001
+From a59956844940151416ead7c4499bd3edba25682a 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.
@@ -91,7 +91,7 @@ index a92987c2ab5..6bc1b47ca5d 100755
  }
  
 diff --git a/tools/makedep.c b/tools/makedep.c
-index df3805591ea..df07eec5ab7 100644
+index 2eed620b429..8b89d0f4858 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
 @@ -184,11 +184,11 @@ struct makefile
@@ -133,7 +133,7 @@ index df3805591ea..df07eec5ab7 100644
      }
  
      if (ret) *filename = src_path;
-@@ -4119,13 +4126,13 @@ static void load_sources( struct makefile *make )
+@@ -4120,13 +4127,13 @@ static void load_sources( struct makefile *make )
      strarray_set_value( &make->vars, "top_srcdir", root_src_dir_path( "" ));
      strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" ));
  
@@ -148,7 +148,7 @@ index df3805591ea..df07eec5ab7 100644
      make->programs      = get_expanded_make_var_array( make, "PROGRAMS" );
      make->scripts       = get_expanded_make_var_array( make, "SCRIPTS" );
      make->imports       = get_expanded_make_var_array( make, "IMPORTS" );
-@@ -4170,8 +4177,11 @@ static void load_sources( struct makefile *make )
+@@ -4171,8 +4178,11 @@ static void load_sources( struct makefile *make )
      strarray_add( &make->include_args, strmake( "-I%s", obj_dir_path( make, "" )));
      if (make->src_dir)
          strarray_add( &make->include_args, strmake( "-I%s", make->src_dir ));

patches/mfplat-streaming-support/0021-mf-Introduce-handler-helper.patch

@@ -1,4 +1,4 @@
-From 84de00850d84c076164a50786317523507d41b4f Mon Sep 17 00:00:00 2001
+From dc3695988edeefd857761928c694e8a9908ca1ce 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.
@@ -16,10 +16,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  create mode 100644 dlls/mf/handler.h
 
 diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in
-index b64cdb4a64d..c0a4a876e0b 100644
+index f1d0571d143..1f741269f71 100644
 --- a/dlls/mf/Makefile.in
 +++ b/dlls/mf/Makefile.in
-@@ -6,6 +6,7 @@ EXTRADLLFLAGS = -mno-cygwin
+@@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin
  
  C_SRCS = \
  	evr.c \
@@ -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 ff6b7c8eac9..2721585e510 100644
+index e1b018b74ce..b8431569e6a 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -23,6 +23,7 @@
@@ -943,7 +943,7 @@ index ff6b7c8eac9..2721585e510 100644
  
  #include <assert.h>
  #include <stdarg.h>
-@@ -1542,21 +1543,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1498,21 +1499,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      return hr;
  }
  
@@ -966,7 +966,7 @@ index ff6b7c8eac9..2721585e510 100644
  };
  
  static struct winegstreamer_stream_handler *impl_from_IMFByteStreamHandler(IMFByteStreamHandler *iface)
-@@ -1564,11 +1555,6 @@ static struct winegstreamer_stream_handler *impl_from_IMFByteStreamHandler(IMFBy
+@@ -1520,11 +1511,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 ff6b7c8eac9..2721585e510 100644
  static HRESULT WINAPI winegstreamer_stream_handler_QueryInterface(IMFByteStreamHandler *iface, REFIID riid, void **obj)
  {
      TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj);
-@@ -1598,247 +1584,44 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if
+@@ -1554,247 +1540,44 @@ static ULONG WINAPI winegstreamer_stream_handler_AddRef(IMFByteStreamHandler *if
  
  static ULONG WINAPI winegstreamer_stream_handler_Release(IMFByteStreamHandler *iface)
  {
@@ -1233,7 +1233,7 @@ index ff6b7c8eac9..2721585e510 100644
  }
  
  static HRESULT WINAPI winegstreamer_stream_handler_GetMaxNumberOfBytesRequiredForResolution(IMFByteStreamHandler *iface, QWORD *bytes)
-@@ -1858,47 +1641,16 @@ static const IMFByteStreamHandlerVtbl winegstreamer_stream_handler_vtbl =
+@@ -1814,47 +1597,16 @@ static const IMFByteStreamHandlerVtbl winegstreamer_stream_handler_vtbl =
      winegstreamer_stream_handler_GetMaxNumberOfBytesRequiredForResolution,
  };
  
@@ -1284,7 +1284,7 @@ index ff6b7c8eac9..2721585e510 100644
  
          if (FAILED(hr = media_source_constructor(stream, &new_source)))
              return hr;
-@@ -1917,64 +1669,6 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s
+@@ -1873,64 +1625,6 @@ static HRESULT winegstreamer_stream_handler_create_object(struct winegstreamer_s
      }
  }
  
@@ -1349,7 +1349,7 @@ index ff6b7c8eac9..2721585e510 100644
  HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
  {
      struct winegstreamer_stream_handler *this;
-@@ -1986,11 +1680,9 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
+@@ -1942,11 +1636,9 @@ HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj)
      if (!this)
          return E_OUTOFMEMORY;
  

patches/mfplat-streaming-support/0022-Introduce-IMFSample-GstBuffer-converter.patch

@@ -1,4 +1,4 @@
-From 643e1db53f311779164c7967b3b960de37388023 Mon Sep 17 00:00:00 2001
+From 57c8325536ff553ded6297f7943d723a2c137eec 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.
@@ -22,12 +22,12 @@ index df1e643c3f6..db0ea881a83 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 ce0c951ac0d..633087e328d 100644
+index ac1fa67da6e..8528be010cf 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
-@@ -1329,3 +1329,77 @@ IMFSample* mf_sample_from_gst_buffer(GstBuffer *gst_buffer)
-     IMFSample_Release(out);
-     return NULL;
+@@ -1288,3 +1288,77 @@ done:
+ 
+     return out;
  }
 +
 +GstBuffer* gst_buffer_from_mf_sample(IMFSample *mf_sample)
@@ -96,7 +96,7 @@ index ce0c951ac0d..633087e328d 100644
 +
 +    return out;
 +
-+    fail:
++fail:
 +    ERR("Failed to copy IMFSample to GstBuffer, hr = %#x\n", hr);
 +    if (mf_buffer)
 +        IMFMediaBuffer_Release(mf_buffer);

patches/mfplat-streaming-support/0023-winegstreamer-Implement-decoder-MFT-on-gstreamer.patch

@@ -1,4 +1,4 @@
-From 9000ed30ea0c6e5f526fa6a243083c2bcbb2e814 Mon Sep 17 00:00:00 2001
+From a61108b69cbb935ec223146d7d3c45b28f357930 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.
@@ -1529,7 +1529,7 @@ index 00000000000..025af7b91ae
 +    }
 +}
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 633087e328d..44b2a00708c 100644
+index 8528be010cf..52b328ffb3f 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -406,6 +406,16 @@ failed:
@@ -1699,10 +1699,10 @@ index 1dc4ba9a10b..3f28b4ddec4 100644
 +]
 +coclass CMSAACDecMFT { }
 diff --git a/include/mfidl.idl b/include/mfidl.idl
-index 4ceeb707bd0..61c9a565415 100644
+index 9f2d825bd5f..20164c39253 100644
 --- a/include/mfidl.idl
 +++ b/include/mfidl.idl
-@@ -1241,3 +1241,5 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365,
+@@ -1290,3 +1290,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);")

patches/mfplat-streaming-support/0024-mfreadwrite-Select-all-streams-when-creating-a-sourc.patch

@@ -1,4 +1,4 @@
-From 19973ad0dbb301e6e70186d784234ee182c4a8cd Mon Sep 17 00:00:00 2001
+From b5d7b985b7f7fe05bb66a4e56c5916da5e07943f 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

patches/mfplat-streaming-support/0025-Miscellaneous.patch

@@ -1,4 +1,4 @@
-From 951be0ccdf8259319d2243656d8aba7957246834 Mon Sep 17 00:00:00 2001
+From 021788ce61cedfc75669f4651e7349dffe418f76 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 16 Mar 2020 15:27:27 -0500
 Subject: [PATCH] Miscellaneous
@@ -102,7 +102,7 @@ index 6659aedefa5..825b46d13bb 100644
  
  #endif
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 2721585e510..3f83701ac72 100644
+index b8431569e6a..db2f14a8c1d 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -92,6 +92,8 @@ struct source_async_command
@@ -131,7 +131,7 @@ index 2721585e510..3f83701ac72 100644
  static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface)
  {
      return CONTAINING_RECORD(iface, struct media_source, async_commands_callback);
-@@ -540,6 +552,11 @@ static gboolean bytestream_query(GstPad *pad, GstObject *parent, GstQuery *query
+@@ -518,6 +530,11 @@ static gboolean bytestream_query(GstPad *pad, GstObject *parent, GstQuery *query
              gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL);
              return TRUE;
          }
@@ -143,7 +143,7 @@ index 2721585e510..3f83701ac72 100644
          default:
          {
              WARN("Unhandled query type %s\n", GST_QUERY_TYPE_NAME(query));
-@@ -602,6 +619,23 @@ GstBusSyncReply bus_watch(GstBus *bus, GstMessage *message, gpointer user)
+@@ -580,6 +597,23 @@ GstBusSyncReply bus_watch(GstBus *bus, GstMessage *message, gpointer user)
              g_error_free(err);
              g_free(dbg_info);
              break;
@@ -167,7 +167,7 @@ index 2721585e510..3f83701ac72 100644
          default:
              break;
      }
-@@ -1082,6 +1116,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID
+@@ -1036,6 +1070,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID
      {
          *out = &source->IMFMediaSource_iface;
      }
@@ -178,7 +178,7 @@ index 2721585e510..3f83701ac72 100644
      else
      {
          FIXME("(%s, %p)\n", debugstr_guid(riid), out);
-@@ -1166,7 +1204,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO
+@@ -1120,7 +1158,7 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO
      if (source->state == SOURCE_SHUTDOWN)
          return MF_E_SHUTDOWN;
  
@@ -187,7 +187,7 @@ index 2721585e510..3f83701ac72 100644
  
      return S_OK;
  }
-@@ -1308,6 +1346,99 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
+@@ -1265,6 +1303,99 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl =
      media_source_Shutdown,
  };
  
@@ -287,7 +287,7 @@ index 2721585e510..3f83701ac72 100644
  /* If this callback is extended to use any significant win32 APIs, a wrapper function
     should be added */
  gboolean stream_found(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer user)
-@@ -1385,6 +1516,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1342,6 +1473,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          return E_OUTOFMEMORY;
  
      object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl;
@@ -296,7 +296,7 @@ index 2721585e510..3f83701ac72 100644
      object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl;
      object->ref = 1;
      object->byte_stream = bytestream;
-@@ -1489,7 +1622,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1446,7 +1579,6 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      heap_free(descriptors);
      descriptors = NULL;
  
@@ -304,7 +304,7 @@ index 2721585e510..3f83701ac72 100644
      {
          IMFAttributes *byte_stream_attributes;
          gint64 total_pres_time = 0;
-@@ -1506,6 +1638,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1463,6 +1595,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
              IMFAttributes_Release(byte_stream_attributes);
          }
  

patches/mfplat-streaming-support/0026-WMV.patch

@@ -1,4 +1,4 @@
-From ceb6638efaf982aa9781889217432131db53d4ad Mon Sep 17 00:00:00 2001
+From b01a705e94b2d10526ed5e7700983e0e404695cc Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 25 Mar 2020 19:07:11 -0500
 Subject: [PATCH] WMV
@@ -52,7 +52,7 @@ index 025af7b91ae..7f2dfc8f292 100644
  };
  
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 44b2a00708c..4d08729e61b 100644
+index 52b328ffb3f..55a04ae849c 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -416,6 +416,10 @@ static HRESULT aac_decoder_create(REFIID riid, void **ret)
@@ -138,10 +138,10 @@ index 3f28b4ddec4..f9b0158fa6a 100644
 +]
 +coclass CLSID_CWMVDecMediaObject {}
 diff --git a/include/mfidl.idl b/include/mfidl.idl
-index 61c9a565415..0885e4e3007 100644
+index 20164c39253..467e123255b 100644
 --- a/include/mfidl.idl
 +++ b/include/mfidl.idl
-@@ -1243,3 +1243,5 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xb
+@@ -1292,3 +1292,5 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xb
  cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")
  cpp_quote("EXTERN_GUID(CLSID_CMSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);")
  cpp_quote("EXTERN_GUID(CLSID_CMSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);")

patches/mfplat-streaming-support/0027-mf-Ask-for-more-samples-from-upstream-node-when-upon.patch

@@ -1,4 +1,4 @@
-From f1ba645100835851a8421e33084866c3999fc894 Mon Sep 17 00:00:00 2001
+From d8fd50cc7faba6597fbfc20a6a858d31750ea387 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Thu, 2 Apr 2020 15:42:18 -0500
 Subject: [PATCH] mf: Ask for more samples from upstream node when upon
@@ -9,7 +9,7 @@ Subject: [PATCH] mf: Ask for more samples from upstream node when upon
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/mf/session.c b/dlls/mf/session.c
-index a1b54b7080e..5bbbfe7d43e 100644
+index 7c82aa42a4b..2f1b589a1aa 100644
 --- a/dlls/mf/session.c
 +++ b/dlls/mf/session.c
 @@ -2503,6 +2503,8 @@ static HRESULT transform_node_pull_samples(struct topo_node *node)

patches/mfplat-streaming-support/0028-winegstreamer-Implement-IMFMedisStream-GetMediaSourc.patch

@@ -1,4 +1,4 @@
-From 93652789576b5203a85f2876834ff2cf82a07686 Mon Sep 17 00:00:00 2001
+From e1990607bb7593b2b1bc38b41fbc9a6cb6b0b2e3 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Thu, 2 Apr 2020 15:46:25 -0500
 Subject: [PATCH] winegstreamer:  Implement IMFMedisStream::GetMediaSource.
@@ -8,10 +8,10 @@ Subject: [PATCH] winegstreamer:  Implement IMFMedisStream::GetMediaSource.
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 3f83701ac72..f520670fe8f 100644
+index db2f14a8c1d..47f04af0a04 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -755,12 +755,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi
+@@ -714,12 +714,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi
  {
      struct media_stream *stream = impl_from_IMFMediaStream(iface);
  

patches/mfplat-streaming-support/0029-Expose-PCM-output-type-on-AAC-decoder.patch

@@ -1,4 +1,4 @@
-From e0c4adb4d3d4a45fc9fe42a87101e2ddd1cc32bb Mon Sep 17 00:00:00 2001
+From 6d1767216f335bf7267363c35915623f0ac17270 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 3 Apr 2020 11:12:33 -0500
 Subject: [PATCH] Expose PCM output type on AAC decoder.

patches/mfplat-streaming-support/0030-mfplat-Add-I420-format-information.patch

@@ -1,4 +1,4 @@
-From 88fb639e27983d3b8b0fde3376855ad407f97127 Mon Sep 17 00:00:00 2001
+From 82072f24b82d7d64679dad1b33c344d63bc8b2b8 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 1 May 2020 11:46:26 -0500
 Subject: [PATCH] mfplat: Add I420 format information.
@@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c
-index 5eaa4fdd08d..db789c4f8e0 100644
+index ccae999b7d7..f8e4a169843 100644
 --- a/dlls/mfplat/mediatype.c
 +++ b/dlls/mfplat/mediatype.c
-@@ -2238,6 +2238,7 @@ static const struct uncompressed_video_format video_formats[] =
+@@ -2630,6 +2630,7 @@ static const struct uncompressed_video_format video_formats[] =
      { &MFVideoFormat_A2R10G10B10,   4, 3, 1, 0 },
      { &MFVideoFormat_RGB8,          1, 3, 1, 0 },
      { &MFVideoFormat_L8,            1, 3, 1, 0 },

patches/mfplat-streaming-support/0031-winegstreamer-Implement-Color-Converter-MFT.patch

@@ -1,4 +1,4 @@
-From df94896976273c69f3b1effdb0953a16370a8c44 Mon Sep 17 00:00:00 2001
+From 7a06e789504d8a15db11044dbac7191b79cb9392 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 1 May 2020 13:20:49 -0500
 Subject: [PATCH] winegstreamer: Implement Color Converter MFT.
@@ -748,7 +748,7 @@ index 73359dd622d..870344e9273 100644
 +
  #endif /* __GST_PRIVATE_INCLUDED__ */
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 4d08729e61b..ba261c9613e 100644
+index 55a04ae849c..65efb771e0b 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -420,6 +420,9 @@ static HRESULT wmv_decoder_create(REFIID riid, void **ret)

patches/mfplat-streaming-support/0032-HACK-Set-BPS-to-16-for-output-template.patch

@@ -1,4 +1,4 @@
-From 6b560402d6d3d7cfa5c15e801ab6489914d893ca Mon Sep 17 00:00:00 2001
+From 3b01bfb7cf705e53e88947743faa8bf64f255eb4 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 1 May 2020 22:36:02 -0500
 Subject: [PATCH] HACK: Set BPS to 16 for output template.

patches/mfplat-streaming-support/0033-Improve-tests.patch

@@ -1,19 +1,19 @@
-From eec41104d35b3045d133ec2be6935cb2cf0833d5 Mon Sep 17 00:00:00 2001
+From 60ea8ccefdb7a0d708d62829a37bfa7f91e88fe2 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 9 Mar 2020 11:59:17 -0500
 Subject: [PATCH] Improve tests
 
 ---
- dlls/mfplat/tests/mfplat.c         | 244 +++++++++++++++++++++++++++--
+ dlls/mfplat/tests/mfplat.c         | 245 +++++++++++++++++++++++++++--
  dlls/mfplat/tests/test.mp4         | Bin 1554 -> 121550 bytes
  dlls/mfreadwrite/tests/mfplat.c    | 116 ++++++++------
  dlls/mfreadwrite/tests/resource.rc |   4 +-
  dlls/mfreadwrite/tests/test.mp4    | Bin 0 -> 121550 bytes
- 5 files changed, 302 insertions(+), 62 deletions(-)
+ 5 files changed, 302 insertions(+), 63 deletions(-)
  create mode 100644 dlls/mfreadwrite/tests/test.mp4
 
 diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
-index 6dd2c3cbe96..03d474d62e8 100644
+index 572cb8dec9a..89621feb82d 100644
 --- a/dlls/mfplat/tests/mfplat.c
 +++ b/dlls/mfplat/tests/mfplat.c
 @@ -440,6 +440,9 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected
@@ -34,10 +34,11 @@ index 6dd2c3cbe96..03d474d62e8 100644
  
      if (!pMFCreateSourceResolver)
      {
-@@ -596,12 +600,27 @@ static void test_source_resolver(void)
+@@ -596,13 +600,27 @@ static void test_source_resolver(void)
      ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
      hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &guid);
      ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr);
+-todo_wine
 -    ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid));
 -    IMFMediaType_Release(media_type);
 +    ok(IsEqualGUID(&guid, &MFVideoFormat_H264), "Unexpected sub type %s.\n", debugstr_guid(&guid));
@@ -64,7 +65,7 @@ index 6dd2c3cbe96..03d474d62e8 100644
      var.vt = VT_EMPTY;
      hr = IMFMediaSource_Start(mediasource, descriptor, &GUID_NULL, &var);
      ok(hr == S_OK, "Failed to start media source, hr %#x.\n", hr);
-@@ -612,9 +631,9 @@ static void test_source_resolver(void)
+@@ -613,9 +631,9 @@ todo_wine
  
      get_event((IMFMediaEventGenerator *)mediasource, MESourceStarted, NULL);
  
@@ -76,7 +77,7 @@ index 6dd2c3cbe96..03d474d62e8 100644
  
      /* Request one beyond EOS, otherwise EndOfStream isn't queued. */
      for (i = 0; i <= sample_count; ++i)
-@@ -630,9 +649,14 @@ static void test_source_resolver(void)
+@@ -631,9 +649,14 @@ todo_wine
      for (i = 0; i < sample_count; ++i)
      {
          static const LONGLONG MILLI_TO_100_NANO = 10000;
@@ -92,7 +93,7 @@ index 6dd2c3cbe96..03d474d62e8 100644
          BOOL ret;
  
          ret = get_event((IMFMediaEventGenerator *)video_stream, MEMediaSample, &var);
-@@ -643,19 +667,38 @@ static void test_source_resolver(void)
+@@ -644,19 +667,38 @@ todo_wine
          ok(var.vt == VT_UNKNOWN, "Unexpected value type %u from MEMediaSample event.\n", var.vt);
          sample = (IMFSample *)var.punkVal;
  
@@ -140,7 +141,7 @@ index 6dd2c3cbe96..03d474d62e8 100644
      }
  
      if (i == sample_count)
-@@ -713,6 +756,178 @@ static void test_source_resolver(void)
+@@ -714,6 +756,178 @@ todo_wine
      DeleteFileW(filename);
  }
  
@@ -319,7 +320,7 @@ index 6dd2c3cbe96..03d474d62e8 100644
  static void init_functions(void)
  {
      HMODULE mod = GetModuleHandleA("mfplat.dll");
-@@ -5539,6 +5754,7 @@ START_TEST(mfplat)
+@@ -5639,6 +5853,7 @@ START_TEST(mfplat)
      test_MFCreateMFByteStreamOnStream();
      test_system_memory_buffer();
      test_source_resolver();
@@ -2678,10 +2679,10 @@ zKs;bQARC}!xiSZ6ESNJ5P+CoKB<O7nEod-NqPX>NU0kHoiM#Wkq*n&-SMq0^0~2cD
 TJ;x-N6hTeOp(eUDP!ruh^$B~#
 
 diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
-index 8ed94289703..5e289d8d5bc 100644
+index 84581f9be9a..e13d428dc3a 100644
 --- a/dlls/mfreadwrite/tests/mfplat.c
 +++ b/dlls/mfreadwrite/tests/mfplat.c
-@@ -622,10 +622,15 @@ static void test_source_reader(void)
+@@ -624,10 +624,15 @@ static void test_source_reader(void)
          return;
      }
  
@@ -2699,7 +2700,7 @@ index 8ed94289703..5e289d8d5bc 100644
      ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr);
  
      if (FAILED(hr))
-@@ -641,14 +646,14 @@ todo_wine
+@@ -643,14 +648,14 @@ todo_wine
      IMFMediaSource_Release(source);
  
      /* Stream selection. */
@@ -2716,7 +2717,7 @@ index 8ed94289703..5e289d8d5bc 100644
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(selected, "Unexpected selection.\n");
  
-@@ -657,17 +662,17 @@ todo_wine
+@@ -659,17 +664,17 @@ todo_wine
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(selected, "Unexpected selection.\n");
  
@@ -2737,7 +2738,7 @@ index 8ed94289703..5e289d8d5bc 100644
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(!selected, "Unexpected selection.\n");
  
-@@ -675,43 +680,43 @@ todo_wine
+@@ -677,43 +682,43 @@ todo_wine
      ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr);
  
      selected = FALSE;
@@ -2789,7 +2790,7 @@ index 8ed94289703..5e289d8d5bc 100644
      ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
      IMFMediaType_Release(mediatype);
  
-@@ -719,56 +724,70 @@ todo_wine
+@@ -721,56 +726,70 @@ todo_wine
      ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
      IMFMediaType_Release(mediatype);
  
@@ -2877,7 +2878,7 @@ index 8ed94289703..5e289d8d5bc 100644
              &actual_index, &stream_flags, NULL, &sample);
      ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);
      ok(actual_index == 0, "Unexpected stream index %u\n", actual_index);
-@@ -777,26 +796,31 @@ todo_wine
+@@ -779,26 +798,31 @@ todo_wine
  
      hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN,
              &actual_index, &stream_flags, NULL, &sample);

patches/mfplat-streaming-support/0034-Revert-Improve-tests.patch

@@ -1,4 +1,4 @@
-From 9c8dfb75e83775e5fb3b3d5ab299ce74c327e486 Mon Sep 17 00:00:00 2001
+From da226874b7c64051cee9bc8e3570e5b01c6b1a86 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 25 Mar 2020 13:58:36 -0500
 Subject: [PATCH] Revert "Improve tests"
@@ -14,7 +14,7 @@ This reverts commit 603b1717a2b511a66d3be99ab5761d49cd5ef34d.
  delete mode 100644 dlls/mfreadwrite/tests/test.mp4
 
 diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c
-index 03d474d62e8..6dd2c3cbe96 100644
+index 89621feb82d..15bd8d207ea 100644
 --- a/dlls/mfplat/tests/mfplat.c
 +++ b/dlls/mfplat/tests/mfplat.c
 @@ -440,9 +440,6 @@ static BOOL get_event(IMFMediaEventGenerator *generator, MediaEventType expected
@@ -320,7 +320,7 @@ index 03d474d62e8..6dd2c3cbe96 100644
  static void init_functions(void)
  {
      HMODULE mod = GetModuleHandleA("mfplat.dll");
-@@ -5754,7 +5539,6 @@ START_TEST(mfplat)
+@@ -5853,7 +5638,6 @@ START_TEST(mfplat)
      test_MFCreateMFByteStreamOnStream();
      test_system_memory_buffer();
      test_source_resolver();
@@ -2679,10 +2679,10 @@ zfQ)qlARIsx0Hh62ATV5k(+0j9`c{9|0J%OK0QBskcDevpw=lTjNcF>i79OBj+33Px
 p$lCDV^w{Kgb))}cXN3$%0oA>6Mg|4R>N*%cfv|D$vvG28{1-l>vtIxJ
 
 diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c
-index 5e289d8d5bc..8ed94289703 100644
+index e13d428dc3a..84581f9be9a 100644
 --- a/dlls/mfreadwrite/tests/mfplat.c
 +++ b/dlls/mfreadwrite/tests/mfplat.c
-@@ -622,15 +622,10 @@ static void test_source_reader(void)
+@@ -624,15 +624,10 @@ static void test_source_reader(void)
          return;
      }
  
@@ -2700,7 +2700,7 @@ index 5e289d8d5bc..8ed94289703 100644
      ok(hr == S_OK, "Failed to create source reader, hr %#x.\n", hr);
  
      if (FAILED(hr))
-@@ -646,14 +641,14 @@ static void test_source_reader(void)
+@@ -648,14 +643,14 @@ static void test_source_reader(void)
      IMFMediaSource_Release(source);
  
      /* Stream selection. */
@@ -2717,7 +2717,7 @@ index 5e289d8d5bc..8ed94289703 100644
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(selected, "Unexpected selection.\n");
  
-@@ -662,17 +657,17 @@ static void test_source_reader(void)
+@@ -664,17 +659,17 @@ static void test_source_reader(void)
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(selected, "Unexpected selection.\n");
  
@@ -2738,7 +2738,7 @@ index 5e289d8d5bc..8ed94289703 100644
      ok(hr == S_OK, "Failed to get stream selection, hr %#x.\n", hr);
      ok(!selected, "Unexpected selection.\n");
  
-@@ -680,43 +675,43 @@ static void test_source_reader(void)
+@@ -682,43 +677,43 @@ static void test_source_reader(void)
      ok(hr == S_OK, "Failed to deselect a stream, hr %#x.\n", hr);
  
      selected = FALSE;
@@ -2790,7 +2790,7 @@ index 5e289d8d5bc..8ed94289703 100644
      ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
      IMFMediaType_Release(mediatype);
  
-@@ -724,70 +719,56 @@ static void test_source_reader(void)
+@@ -726,70 +721,56 @@ static void test_source_reader(void)
      ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr);
      IMFMediaType_Release(mediatype);
  
@@ -2878,7 +2878,7 @@ index 5e289d8d5bc..8ed94289703 100644
              &actual_index, &stream_flags, NULL, &sample);
      ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);
      ok(actual_index == 0, "Unexpected stream index %u\n", actual_index);
-@@ -796,31 +777,26 @@ static void test_source_reader(void)
+@@ -798,31 +779,26 @@ static void test_source_reader(void)
  
      hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN,
              &actual_index, &stream_flags, NULL, &sample);

patches/mfplat-streaming-support/0035-Report-streams-backwards-and-only-select-one-of-each.patch

@@ -1,4 +1,4 @@
-From 804dfb705fa7df8079e1733a4eb35acb7c2d275c Mon Sep 17 00:00:00 2001
+From 8b1dcc0ce16ad0e0ee933ec8f9ad606f80f6fd0b Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 5 May 2020 15:35:16 -0500
 Subject: [PATCH] Report streams backwards and only select one of each stream
@@ -9,10 +9,10 @@ Subject: [PATCH] Report streams backwards and only select one of each stream
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index f520670fe8f..1573a079a1b 100644
+index 47f04af0a04..ada6a112262 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1510,6 +1510,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1467,6 +1467,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          GST_STATIC_PAD_TEMPLATE("mf_src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY);
  
      struct media_source *object = heap_alloc_zero(sizeof(*object));
@@ -20,19 +20,19 @@ index f520670fe8f..1573a079a1b 100644
      IMFStreamDescriptor **descriptors = NULL;
      unsigned int i;
      HRESULT hr;
-@@ -1611,15 +1612,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1568,15 +1569,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*));
-     for (unsigned int i = 0; i < object->stream_count; i++)
+     for (i = 0; i < object->stream_count; i++)
      {
 -        IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[i]);
 +        IMFMediaStream_GetStreamDescriptor(&object->streams[i]->IMFMediaStream_iface, &descriptors[object->stream_count - 1 - i]);
      }
  
-     if (FAILED(MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc)))
+     if (FAILED(hr = MFCreatePresentationDescriptor(object->stream_count, descriptors, &object->pres_desc)))
          goto fail;
  
 +    /* Select one of each major type. */
-     for (unsigned int i = 0; i < object->stream_count; i++)
+     for (i = 0; i < object->stream_count; i++)
      {
 -        IMFPresentationDescriptor_SelectStream(object->pres_desc, i);
 +        IMFMediaTypeHandler *handler;

patches/mfplat-streaming-support/0036-winegstreamer-Implement-IMFMediaSource-Stop.patch

@@ -1,4 +1,4 @@
-From 7d0d0e010c7ad246fc5324bae3f08315e479c3c8 Mon Sep 17 00:00:00 2001
+From 15b2f865bff1b546186ea23dbcb070987b93564f Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Thu, 7 May 2020 13:09:47 -0500
 Subject: [PATCH] winegstreamer: Implement IMFMediaSource::Stop.
@@ -9,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 28 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 1573a079a1b..e5bdfefc9d5 100644
+index ada6a112262..1d2c999b7e1 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -65,6 +65,7 @@ struct media_stream
@@ -20,8 +20,8 @@ index 1573a079a1b..e5bdfefc9d5 100644
      SOURCE_ASYNC_REQUEST_SAMPLE,
  };
  
-@@ -357,6 +358,23 @@ static HRESULT start_pipeline(struct media_source *source, struct source_async_c
-     return S_OK;
+@@ -356,6 +357,23 @@ static void start_pipeline(struct media_source *source, struct source_async_comm
+     gst_element_set_state(source->container, GST_STATE_PLAYING);
  }
  
 +static void stop_pipeline(struct media_source *source)
@@ -44,7 +44,7 @@ index 1573a079a1b..e5bdfefc9d5 100644
  static void dispatch_end_of_presentation(struct media_source *source)
  {
      PROPVARIANT empty = {.vt = VT_EMPTY};
-@@ -448,6 +466,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA
+@@ -428,6 +446,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA
          case SOURCE_ASYNC_START:
              start_pipeline(source, command);
              break;
@@ -54,7 +54,7 @@ index 1573a079a1b..e5bdfefc9d5 100644
          case SOURCE_ASYNC_REQUEST_SAMPLE:
              wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token);
              break;
-@@ -1263,13 +1284,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD
+@@ -1208,13 +1229,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD
  static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface)
  {
      struct media_source *source = impl_from_IMFMediaSource(iface);

patches/mfplat-streaming-support/0037-winegstreamer-Introduce-MPEG-4-Section-2-video-decod.patch

@@ -1,4 +1,4 @@
-From 6aaaa5a3bd7d83ff19bb0ad89fdde795bee2cd79 Mon Sep 17 00:00:00 2001
+From f71c196ffa5529b509f884b234e02426563fadec Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 11 May 2020 16:05:50 -0500
 Subject: [PATCH] winegstreamer: Introduce MPEG-4 Section-2 video decoder.
@@ -53,7 +53,7 @@ index a86e9db410e..c5d9cbad392 100644
  };
  
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index ba261c9613e..59b6e2321a6 100644
+index 65efb771e0b..7ae60626f51 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -421,6 +421,11 @@ static HRESULT wmv_decoder_create(REFIID riid, void **ret)
@@ -136,10 +136,10 @@ index 1556b6cff9f..5969eaa591a 100644
      threading(both),
      uuid(82d353df-90bd-4382-8bc2-3f6192b76e34)
 diff --git a/include/mfidl.idl b/include/mfidl.idl
-index 0885e4e3007..a344986a7aa 100644
+index 467e123255b..4879b612e19 100644
 --- a/include/mfidl.idl
 +++ b/include/mfidl.idl
-@@ -1243,5 +1243,6 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xb
+@@ -1292,5 +1292,6 @@ cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xb
  cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")
  cpp_quote("EXTERN_GUID(CLSID_CMSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);")
  cpp_quote("EXTERN_GUID(CLSID_CMSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);")

patches/mfplat-streaming-support/0038-HACK-Switch-between-all-selection-streams-on-MF_SOUR.patch

@@ -1,4 +1,4 @@
-From 21f46bf4ce4d91dc99c5f8aa79f789c1c081b582 Mon Sep 17 00:00:00 2001
+From cf7389b2369562b2a25c8fab9f439f7f4c002e96 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 12 May 2020 16:48:52 -0500
 Subject: [PATCH] HACK: Switch between all selection streams on

patches/mfplat-streaming-support/0039-winegstreamer-Introduce-WMA-audio-decoder.patch

@@ -1,4 +1,4 @@
-From 3830be6070987cbca119fd705e32c6a18e29d10d Mon Sep 17 00:00:00 2001
+From fb1cfa8db6e327749aef769e385b9effc62a4c09 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 12 May 2020 16:50:41 -0500
 Subject: [PATCH] winegstreamer: Introduce WMA audio decoder.
@@ -53,7 +53,7 @@ index c5d9cbad392..7ce72a9a6a3 100644
          &MFMediaType_Video,
          m4s2_input_types,
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 59b6e2321a6..752682da6e3 100644
+index 7ae60626f51..58ca955f26b 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -421,6 +421,11 @@ static HRESULT wmv_decoder_create(REFIID riid, void **ret)
@@ -134,10 +134,10 @@ index 5969eaa591a..c014d359a39 100644
      threading(both),
      uuid(98230571-0087-4204-b020-3282538e57d3)
 diff --git a/include/mfidl.idl b/include/mfidl.idl
-index a344986a7aa..5154b798dfb 100644
+index 4879b612e19..ecdfed3b1c4 100644
 --- a/include/mfidl.idl
 +++ b/include/mfidl.idl
-@@ -1245,4 +1245,5 @@ cpp_quote("EXTERN_GUID(CLSID_CMSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1
+@@ -1294,4 +1294,5 @@ cpp_quote("EXTERN_GUID(CLSID_CMSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1
  cpp_quote("EXTERN_GUID(CLSID_CMSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);")
  cpp_quote("EXTERN_GUID(CLSID_CMpeg4sDecMFT, 0x5686a0d9, 0xfe39, 0x409f, 0x9d, 0xff, 0x3f, 0xdb, 0xc8, 0x49, 0xf9, 0xf5);")
  cpp_quote("EXTERN_GUID(CLSID_ASFByteStreamHandler, 0x41457294, 0x644c, 0x4298, 0xa2, 0x8a, 0xbd, 0x69, 0xf2, 0xc0, 0xcf, 0x3b);")

patches/mfplat-streaming-support/0040-Support-stereo-down-folding.patch

@@ -1,4 +1,4 @@
-From b84fcf190ec57862d3bcd6e2da85187db36bcf2c Mon Sep 17 00:00:00 2001
+From 4cf5138437b957367ba7c455e1f8317eb4cefc94 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 13 May 2020 12:32:42 -0500
 Subject: [PATCH] Support stereo down folding.

patches/mfplat-streaming-support/0041-winegstreamer-Implement-MF_SD_LANGUAGE.patch

@@ -1,4 +1,4 @@
-From ba73171269de7991a8b113119889239864138b58 Mon Sep 17 00:00:00 2001
+From 921b962ffd346cdcd3764a4182a34d81d5b9c3c7 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 11 Aug 2020 13:41:15 -0500
 Subject: [PATCH] winegstreamer: Implement MF_SD_LANGUAGE.
@@ -9,10 +9,10 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index e5bdfefc9d5..2beb48ace6f 100644
+index 1d2c999b7e1..83217ebb5b7 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1690,8 +1690,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1647,8 +1647,12 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
          /* TODO: consider streams which don't start at T=0 */
          for (unsigned int i = 0; i < object->stream_count; i++)
          {
@@ -27,7 +27,7 @@ index e5bdfefc9d5..2beb48ace6f 100644
              {
                  gint64 stream_pres_time;
                  gst_query_parse_duration(query, NULL, &stream_pres_time);
-@@ -1705,6 +1709,31 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1662,6 +1666,31 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
              {
                  WARN("Unable to get presentation time of stream %u\n", i);
              }

patches/mfplat-streaming-support/0042-Revert-mf-topoloader-Add-a-structure-for-iterative-b.patch

@@ -1,4 +1,4 @@
-From 9ef1327b688592e870d35545f2960794a9f257f7 Mon Sep 17 00:00:00 2001
+From 1c7e8fb2a1af7c477e6b3d4df89d27df9626fcc6 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 11 Aug 2020 15:58:42 -0500
 Subject: [PATCH] Revert "mf/topoloader: Add a structure for iterative branch
@@ -11,7 +11,7 @@ This reverts commit e308d81a617632fe0fedd243952f79e8d9ec05b4.
  2 files changed, 4 insertions(+), 143 deletions(-)
 
 diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
-index 2c02b1d8e54..1cefeb730b0 100644
+index e6f3593a74b..809209eef72 100644
 --- a/dlls/mf/tests/mf.c
 +++ b/dlls/mf/tests/mf.c
 @@ -1400,7 +1400,6 @@ static void test_topology_loader(void)
@@ -22,7 +22,7 @@ index 2c02b1d8e54..1cefeb730b0 100644
      unsigned int count, value;
      IMFMediaType *media_type;
      IMFStreamDescriptor *sd;
-@@ -1516,19 +1515,15 @@ todo_wine
+@@ -1515,19 +1514,15 @@ todo_wine
      hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink);
      ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr);
  

patches/mfplat-streaming-support/0043-Revert-mf-topoloader-Clone-source-nodes-as-a-first-l.patch

@@ -1,4 +1,4 @@
-From 308e012c128d4e90e9a69bd524eaf6ce3bf7b075 Mon Sep 17 00:00:00 2001
+From a9fa76930f0473e59f5de61b2e245266c93383e0 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 11 Aug 2020 15:59:04 -0500
 Subject: [PATCH] Revert "mf/topoloader: Clone source nodes as a first layer of

patches/mfplat-streaming-support/0044-Revert-mf-topoloader-Switch-to-public-interface-for-.patch

@@ -1,4 +1,4 @@
-From 823f96ad1f877d692f7ac9d325d512a4397717ca Mon Sep 17 00:00:00 2001
+From 7520143f940aefca819b2fa734e3dc9777f67d1c Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 11 Aug 2020 15:59:13 -0500
 Subject: [PATCH] Revert "mf/topoloader: Switch to public interface for initial

patches/mfplat-streaming-support/0045-mf-Partially-implement-the-topology-loader.patch

@@ -1,4 +1,4 @@
-From 6de8d406ea96655a3fe5ac72651029396657e906 Mon Sep 17 00:00:00 2001
+From a89cd98a0cc6fa156e0a6f2aac33eab6f3384e56 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Sergio=20G=C3=B3mez=20Del=20Real?=
  <sdelreal@codeweavers.com>
 Date: Wed, 1 Apr 2020 16:11:07 -0500
@@ -14,7 +14,7 @@ Signed-off-by: Sergio Gómez Del Real <sdelreal@codeweavers.com>
  2 files changed, 321 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
-index 1cefeb730b0..77037b5ec9d 100644
+index 809209eef72..24d4140230b 100644
 --- a/dlls/mf/tests/mf.c
 +++ b/dlls/mf/tests/mf.c
 @@ -1428,7 +1428,6 @@ static void test_topology_loader(void)
@@ -25,7 +25,7 @@ index 1cefeb730b0..77037b5ec9d 100644
      ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr);
  
      hr = MFCreateSourceResolver(&resolver);
-@@ -1476,7 +1475,6 @@ todo_wine
+@@ -1475,7 +1474,6 @@ todo_wine
  
      /* Source node only. */
      hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL);
@@ -33,7 +33,7 @@ index 1cefeb730b0..77037b5ec9d 100644
      ok(hr == MF_E_TOPO_UNSUPPORTED, "Unexpected hr %#x.\n", hr);
  
      /* Add grabber sink. */
-@@ -1502,7 +1500,6 @@ todo_wine
+@@ -1501,7 +1499,6 @@ todo_wine
      ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr);
  
      hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL);

patches/mfplat-streaming-support/0046-mf-Miscelaneous-fixes-to-topology-resolution.patch

@@ -1,4 +1,4 @@
-From 4044dfd59ca367fb91ae4b32c87c9ea0fcabd512 Mon Sep 17 00:00:00 2001
+From 1ee32d49248a9bc778a68d8cccb252e9f0dd849c Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Thu, 2 Apr 2020 15:43:52 -0500
 Subject: [PATCH] mf: Miscelaneous fixes to topology resolution.

patches/mfplat-streaming-support/0047-Rewrite-branch-resolver.patch

@@ -1,4 +1,4 @@
-From 535dff3cfe4ad942848d7639cb7ce27cc4062f65 Mon Sep 17 00:00:00 2001
+From d8a7489049950d34ca66fc9b092348911443f6e9 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Thu, 2 Apr 2020 15:45:52 -0500
 Subject: [PATCH] Rewrite branch resolver.

patches/mfplat-streaming-support/0048-mf-sar-Compare-against-native-media-type-in-IsMediaT.patch

@@ -1,4 +1,4 @@
-From 82bb9db7e107e615b1f505b19697f8ae9f451c9d Mon Sep 17 00:00:00 2001
+From 0f48d8126232b0c3ac0d49a6429002ddffbb2ba2 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 26 Aug 2020 10:23:58 -0500
 Subject: [PATCH] mf/sar: Compare against native media type in

patches/mfplat-streaming-support/0049-winegstreamer-Implement-audio-conversion-MFT.patch

@@ -1,4 +1,4 @@
-From 4250c79abdedb230e0f89afa8a884c2e42743c89 Mon Sep 17 00:00:00 2001
+From 8b3eaf787fa0df4d29285b9bcb43a6b611f99dbb Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Wed, 26 Aug 2020 10:28:37 -0500
 Subject: [PATCH] winegstreamer: Implement audio conversion MFT.
@@ -806,7 +806,7 @@ index dc23d5201b1..6e718aa6ebe 100644
  
  #endif /* __GST_PRIVATE_INCLUDED__ */
 diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
-index 752682da6e3..9f469a45688 100644
+index 58ca955f26b..36f1c2d13fc 100644
 --- a/dlls/winegstreamer/mfplat.c
 +++ b/dlls/winegstreamer/mfplat.c
 @@ -433,6 +433,8 @@ static HRESULT m4s2_decoder_create(REFIID riid, void **ret)

patches/mfplat-streaming-support/0050-HACK-Shutdown-media-sinks-on-session-shutdown.patch

@@ -0,0 +1,36 @@
+From 56917d0d84efe6234170112713d3685e67c0b0f2 Mon Sep 17 00:00:00 2001
+From: Derek Lesho <dlesho@codeweavers.com>
+Date: Wed, 14 Oct 2020 11:07:34 -0500
+Subject: [PATCH] HACK: Shutdown media sinks on session shutdown.
+
+TODO: We should be doing this through IMFActivate.
+---
+ dlls/mf/session.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/dlls/mf/session.c b/dlls/mf/session.c
+index 2f1b589a1aa..6fce432da72 100644
+--- a/dlls/mf/session.c
++++ b/dlls/mf/session.c
+@@ -1637,6 +1637,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface)
+ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
+ {
+     struct media_session *session = impl_from_IMFMediaSession(iface);
++    struct media_sink *sink;
+     HRESULT hr = S_OK;
+ 
+     FIXME("%p.\n", iface);
+@@ -1648,6 +1649,10 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
+         IMFMediaEventQueue_Shutdown(session->event_queue);
+         if (session->quality_manager)
+             IMFQualityManager_Shutdown(session->quality_manager);
++        LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry)
++        {
++            IMFMediaSink_Shutdown(sink->sink);
++        }
+     }
+     LeaveCriticalSection(&session->cs);
+ 
+-- 
+2.28.0
+

patches/mfplat-streaming-support/0054-winegstreamer-Support-older-versions.patch

@@ -1,48 +0,0 @@
-From d3952286014b94744574841c324bec62c84e2bcb Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Sun, 13 Sep 2020 13:39:07 +1000
-Subject: [PATCH] winegstreamer: Support older versions
-
----
- configure.ac                      | 4 +++-
- dlls/winegstreamer/media_source.c | 2 ++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6b8b6b27bac..efd36af9e5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1642,7 +1642,9 @@ then
-               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]],
-                                                  [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])],
-                 [AC_MSG_RESULT([yes])
--                 AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])],
-+                 AC_CHECK_LIB(gstreamer-1.0,gst_pad_new,[:],,[$GSTREAMER_LIBS])
-+                 WINE_CHECK_LIB_FUNCS([gst_structure_get_list], [$GSTREAMER_LIBS])
-+                 ],
-                 [AC_MSG_RESULT([no])
-                  ac_glib2_broken=yes
-                  WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])])
-diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index d99b8024599..a6ef561ecc9 100644
---- a/dlls/winegstreamer/media_source.c
-+++ b/dlls/winegstreamer/media_source.c
-@@ -1059,6 +1059,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
- 
-     if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "video/x-raw"))
-     {
-+#ifdef HAVE_GST_STRUCTURE_GET_LIST
-         GstElementFactory *videoconvert_factory = gst_element_factory_find("videoconvert");
-         /* output every format supported by videoconvert */
-         const GList *template_list = gst_element_factory_get_static_pad_templates(videoconvert_factory);
-@@ -1086,6 +1087,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream)
-             gst_caps_unref(src_caps);
-             break;
-         }
-+#endif
-     }
-     else if (!strcmp(gst_structure_get_name(gst_caps_get_structure(current_caps, 0)), "audio/x-raw"))
-     {
--- 
-2.28.0
-

patches/patchinstall.sh

@@ -2661,33 +2661,33 @@ fi
 # |   *	[#49692] mfplat: Improved support for multiple video formats.
 # |
 # | Modified files:
-# |   *	configure.ac, dlls/mf/Makefile.in, dlls/mf/handler.c, dlls/mf/handler.h, dlls/mf/main.c, dlls/mf/sar.c,
-# | 	dlls/mf/session.c, dlls/mf/tests/mf.c, dlls/mf/topology.c, dlls/mfplat/mediatype.c, dlls/mfplat/tests/mfplat.c,
-# | 	dlls/mfplat/tests/test.mp4, dlls/mfreadwrite/reader.c, dlls/mfreadwrite/tests/mfplat.c,
-# | 	dlls/mfreadwrite/tests/resource.rc, dlls/mfreadwrite/tests/test.mp4, dlls/winegstreamer/Makefile.in,
-# | 	dlls/winegstreamer/audioconvert.c, dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/gst_cbs.c,
-# | 	dlls/winegstreamer/gst_cbs.h, dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c,
-# | 	dlls/winegstreamer/media_source.c, dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c,
-# | 	dlls/winegstreamer/winegstreamer_classes.idl, include/mfidl.idl, tools/make_makefiles, tools/makedep.c
+# |   *	dlls/mf/Makefile.in, dlls/mf/handler.c, dlls/mf/handler.h, dlls/mf/main.c, dlls/mf/sar.c, dlls/mf/session.c,
+# | 	dlls/mf/tests/mf.c, dlls/mf/topology.c, dlls/mfplat/mediatype.c, dlls/mfplat/tests/mfplat.c, dlls/mfplat/tests/test.mp4,
+# | 	dlls/mfreadwrite/reader.c, dlls/mfreadwrite/tests/mfplat.c, dlls/mfreadwrite/tests/resource.rc,
+# | 	dlls/mfreadwrite/tests/test.mp4, dlls/winegstreamer/Makefile.in, dlls/winegstreamer/audioconvert.c,
+# | 	dlls/winegstreamer/colorconvert.c, dlls/winegstreamer/gst_cbs.c, dlls/winegstreamer/gst_cbs.h,
+# | 	dlls/winegstreamer/gst_private.h, dlls/winegstreamer/main.c, dlls/winegstreamer/media_source.c,
+# | 	dlls/winegstreamer/mf_decode.c, dlls/winegstreamer/mfplat.c, dlls/winegstreamer/winegstreamer_classes.idl,
+# | 	include/mfidl.idl, tools/make_makefiles, tools/makedep.c
 # |
 if test "$enable_mfplat_streaming_support" -eq 1; then
-	patch_apply mfplat-streaming-support/0001-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch
+	patch_apply mfplat-streaming-support/0001-mf-Unconditionally-deliver-NULL-EOS-samples.patch
 	patch_apply mfplat-streaming-support/0002-winegstreamer-Insert-videoconvert-into-decoded-video.patch
 	patch_apply mfplat-streaming-support/0003-winegstreamer-Insert-audioconvert-into-decoded-audio.patch
-	patch_apply mfplat-streaming-support/0004-winegstreamer-Translate-H.264-caps-to-attributes.patch
-	patch_apply mfplat-streaming-support/0005-winegstreamer-Translate-WMV-caps-to-attributes.patch
-	patch_apply mfplat-streaming-support/0006-winegstreamer-Translate-AAC-caps-to-attributes.patch
-	patch_apply mfplat-streaming-support/0007-winegstreamer-Translate-MPEG-4-Section-2-caps-to-att.patch
-	patch_apply mfplat-streaming-support/0008-winegstreamer-Translate-WMA-caps-to-attributes.patch
-	patch_apply mfplat-streaming-support/0009-winegstreamer-Implement-IMFMediaSource-CreatePresent.patch
-	patch_apply mfplat-streaming-support/0010-winegstreamer-Introduce-IMFMediaType-GstCaps-convert.patch
-	patch_apply mfplat-streaming-support/0011-winegstreamer-Translate-H.264-attributes-to-caps.patch
-	patch_apply mfplat-streaming-support/0012-winegstreamer-Translate-WMV-attributes-to-caps.patch
-	patch_apply mfplat-streaming-support/0013-winegstreamer-Translate-AAC-attributes-to-caps.patch
-	patch_apply mfplat-streaming-support/0014-winegstreamer-Translate-MPEG-4-Section-2-attributes-.patch
-	patch_apply mfplat-streaming-support/0015-winegstreamer-Translate-WMA-attributes-to-caps.patch
-	patch_apply mfplat-streaming-support/0016-winegstreamer-Implement-IMFMediaSource-Start.patch
-	patch_apply mfplat-streaming-support/0017-winegstreamer-Implement-IMFMediaStream-RequestSample.patch
+	patch_apply mfplat-streaming-support/0004-winegstreamer-Implement-IMFMediaSource-CreatePresent.patch
+	patch_apply mfplat-streaming-support/0005-winegstreamer-Implement-IMFMediaSource-Start.patch
+	patch_apply mfplat-streaming-support/0006-winegstreamer-Implement-IMFMediaStream-RequestSample.patch
+	patch_apply mfplat-streaming-support/0007-winegstreamer-Insert-parser-into-pipeline-to-rectify.patch
+	patch_apply mfplat-streaming-support/0008-winegstreamer-Translate-H.264-caps-to-attributes.patch
+	patch_apply mfplat-streaming-support/0009-winegstreamer-Translate-WMV-caps-to-attributes.patch
+	patch_apply mfplat-streaming-support/0010-winegstreamer-Translate-AAC-caps-to-attributes.patch
+	patch_apply mfplat-streaming-support/0011-winegstreamer-Translate-MPEG-4-Section-2-caps-to-att.patch
+	patch_apply mfplat-streaming-support/0012-winegstreamer-Translate-WMA-caps-to-attributes.patch
+	patch_apply mfplat-streaming-support/0013-winegstreamer-Translate-H.264-attributes-to-caps.patch
+	patch_apply mfplat-streaming-support/0014-winegstreamer-Translate-WMV-attributes-to-caps.patch
+	patch_apply mfplat-streaming-support/0015-winegstreamer-Translate-AAC-attributes-to-caps.patch
+	patch_apply mfplat-streaming-support/0016-winegstreamer-Translate-MPEG-4-Section-2-attributes-.patch
+	patch_apply mfplat-streaming-support/0017-winegstreamer-Translate-WMA-attributes-to-caps.patch
 	patch_apply mfplat-streaming-support/0018-winegstreamer-Implement-IMFMediaSource-GetCharacteri.patch
 	patch_apply mfplat-streaming-support/0019-winegstreamer-Calculate-the-MF_PD_DURATION-of-the-me.patch
 	patch_apply mfplat-streaming-support/0020-tools-Add-support-for-multiple-parent-directories.patch
@@ -2720,8 +2720,8 @@ if test "$enable_mfplat_streaming_support" -eq 1; then
 	patch_apply mfplat-streaming-support/0047-Rewrite-branch-resolver.patch
 	patch_apply mfplat-streaming-support/0048-mf-sar-Compare-against-native-media-type-in-IsMediaT.patch
 	patch_apply mfplat-streaming-support/0049-winegstreamer-Implement-audio-conversion-MFT.patch
+	patch_apply mfplat-streaming-support/0050-HACK-Shutdown-media-sinks-on-session-shutdown.patch
 	patch_apply mfplat-streaming-support/0053-winegstreamer-Support-eAVEncH264VProfile_Constrained.patch
-	patch_apply mfplat-streaming-support/0054-winegstreamer-Support-older-versions.patch
 fi
 
 # Patchset mmsystem.dll16-MIDIHDR_Refcount