[PATCH v3 0/1] MR6533: winegstreamer: Tweak h264 caps conversion.

[Rémi Bernon]

--
  v3: winegstreamer: Pass H264 codec data as streamheader.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6533

[PATCH v3 1/1] winegstreamer: Pass H264 codec data as streamheader.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57204
---
 dlls/winegstreamer/wg_media_type.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_media_type.c b/dlls/winegstreamer/wg_media_type.c
index 300dace5c52..a8b3f75ea28 100644
--- a/dlls/winegstreamer/wg_media_type.c
+++ b/dlls/winegstreamer/wg_media_type.c
@@ -290,12 +290,19 @@ static void init_caps_from_video_cinepak(GstCaps *caps, const MFVIDEOFORMAT *for
 
 static void init_caps_from_video_h264(GstCaps *caps, const MFVIDEOFORMAT *format, UINT format_size)
 {
-    init_caps_codec_data(caps, format + 1, format_size - sizeof(*format));
+    GstBuffer *buffer;
 
     gst_structure_remove_field(gst_caps_get_structure(caps, 0), "format");
     gst_structure_set_name(gst_caps_get_structure(caps, 0), "video/x-h264");
     gst_caps_set_simple(caps, "stream-format", G_TYPE_STRING, "byte-stream", NULL);
     gst_caps_set_simple(caps, "alignment", G_TYPE_STRING, "au", NULL);
+
+    if (format_size > sizeof(*format) && (buffer = gst_buffer_new_and_alloc(format_size - sizeof(*format))))
+    {
+        gst_buffer_fill(buffer, 0, format + 1, format_size - sizeof(*format));
+        gst_caps_set_simple(caps, "streamheader", GST_TYPE_BUFFER, buffer, NULL);
+        gst_buffer_unref(buffer);
+    }
 }
 
 static void init_caps_from_video_wmv(GstCaps *caps, const MFVIDEOFORMAT *format, UINT format_size,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6533

[Rémi Bernon]

Testing the demuxer outputs it looks like Windows simply converts every stream to Annex B format, even if it is stored in AVC format in the file. https://gitlab.winehq.org/wine/wine/-/merge_requests/6551 implements what we need with the FFmpeg backend, GStreamer backend doesn't expose compressed streams.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6533#note_83175

[Rémi Bernon]

I updated the MR to use streamheader for codec data unconditionally.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6533#note_83177