Rebase against 9faa5eeddd24a057d9ff522259c9dbdc6203c098.

patches/mfplat-streaming-support/0001-winegstreamer-Add-IMFSeekInfo-GetNearestKeyFrames-st.patch

@@ -1,8 +1,7 @@
-From 71055ca3dfc664a37a5ecf428ba75e89648acc89 Mon Sep 17 00:00:00 2001
+From ab1e5e5535fc22d14e64d8f6b0f42188440f6884 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 2 Nov 2020 09:56:54 -0600
-Subject: [PATCH 01/45] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames
- stub.
+Subject: [PATCH] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames stub.
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@@ -10,7 +9,7 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 111 insertions(+)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 66bdf64a669..828958e47e2 100644
+index 5c502cf3ed5..f08ab77746e 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -91,6 +91,8 @@ struct source_async_command
@@ -151,7 +150,7 @@ index 66bdf64a669..828958e47e2 100644
  {
      struct media_source *source = user;
 @@ -1256,6 +1365,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
-     }
+         return E_OUTOFMEMORY;
  
      object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl;
 +    object->IMFGetService_iface.lpVtbl = &IMFGetService_vtbl;
@@ -160,5 +159,5 @@ index 66bdf64a669..828958e47e2 100644
      object->ref = 1;
      object->byte_stream = bytestream;
 -- 
-2.28.0
+2.29.2
 

patches/mfplat-streaming-support/0003-winegstreamer-Set-MF_PD_MIME_TYPE-on-source-s-presen.patch

@@ -1,8 +1,8 @@
-From 20c483cf8d0b9ca634a325239006b41b67cce3eb Mon Sep 17 00:00:00 2001
+From 0913eb045e183f568c9e3962cd09e3624a7893b9 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Mon, 2 Nov 2020 10:18:27 -0600
-Subject: [PATCH 03/45] winegstreamer: Set MF_PD_MIME_TYPE on source's
- presentation descriptor.
+Subject: [PATCH] winegstreamer: Set MF_PD_MIME_TYPE on source's presentation
+ descriptor.
 
 Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
@@ -10,13 +10,13 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
  1 file changed, 13 insertions(+)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 272dbfbfca6..36f995cc6ef 100644
+index a60cdbc8800..81c5c197072 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
 @@ -1351,6 +1351,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
  
-     struct media_source *object = heap_alloc_zero(sizeof(*object));
      IMFStreamDescriptor **descriptors = NULL;
+     struct media_source *object;
 +    IMFAttributes *byte_stream_attributes;
      gint64 total_pres_time = 0;
      DWORD bytestream_caps;
@@ -41,5 +41,5 @@ index 272dbfbfca6..36f995cc6ef 100644
  
      *out_media_source = object;
 -- 
-2.28.0
+2.29.2
 

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

@@ -1,26 +1,27 @@
-From 59f92f0be3ee0737143dba49a6677cefb448785b Mon Sep 17 00:00:00 2001
+From eaa6710bbf3abb9803e44033a8c504b7c6ba4c44 Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Tue, 5 May 2020 15:35:16 -0500
-Subject: [PATCH 30/45] Report streams backwards and only select one of each
- stream type.
+Subject: [PATCH] Report streams backwards and only select one of each stream
+ type.
 
 ---
- dlls/winegstreamer/media_source.c | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
+ dlls/winegstreamer/media_source.c | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
-index 0fcc2ca42f3..9a6b2b8242c 100644
+index 2f74868956f..dd99afb2214 100644
 --- a/dlls/winegstreamer/media_source.c
 +++ b/dlls/winegstreamer/media_source.c
-@@ -1460,6 +1460,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1458,7 +1458,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+ {
+     GstStaticPadTemplate src_template =
          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));
+-
 +    BOOL video_selected = FALSE, audio_selected = FALSE;
      IMFStreamDescriptor **descriptors = NULL;
+     struct media_source *object;
      IMFAttributes *byte_stream_attributes;
-     gint64 total_pres_time = 0;
-@@ -1573,15 +1574,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
+@@ -1573,15 +1573,34 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_
      descriptors = heap_alloc(object->stream_count * sizeof(IMFStreamDescriptor*));
      for (i = 0; i < object->stream_count; i++)
      {
@@ -58,5 +59,5 @@ index 0fcc2ca42f3..9a6b2b8242c 100644
      }
      heap_free(descriptors);
 -- 
-2.28.0
+2.29.2