[PATCH 0/1] MR8493: winegstreamer: Remove 'au' alignment for h264.

[Brendan McGrath (＠redmcg)]

h264parse does not correctly determine 'nal' alignment if this caps is
provided.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58425

**Note**: for this change to work correctly, `h264parse` must be present.

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

[PATCH 1/1] winegstreamer: Remove 'au' alignment for h264.

[Brendan McGrath]

From: Brendan McGrath <bmcgrath(a)codeweavers.com>

h264parse does not correctly determine 'nal' alignment if this caps is
provided.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58425
---
 dlls/winegstreamer/wg_format.c     | 1 -
 dlls/winegstreamer/wg_media_type.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c
index 9916a5a9961..bed7ffb2964 100644
--- a/dlls/winegstreamer/wg_format.c
+++ b/dlls/winegstreamer/wg_format.c
@@ -920,7 +920,6 @@ static GstCaps *wg_format_to_caps_video_h264(const struct wg_format *format)
     if (!(caps = gst_caps_new_empty_simple("video/x-h264")))
         return NULL;
     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->u.video.width)
         gst_caps_set_simple(caps, "width", G_TYPE_INT, format->u.video.width, NULL);
diff --git a/dlls/winegstreamer/wg_media_type.c b/dlls/winegstreamer/wg_media_type.c
index 44b39743bc3..b5ce04ef03e 100644
--- a/dlls/winegstreamer/wg_media_type.c
+++ b/dlls/winegstreamer/wg_media_type.c
@@ -296,7 +296,6 @@ static void init_caps_from_video_h264(GstCaps *caps, const MFVIDEOFORMAT *format
     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))))
     {
-- 
GitLab

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

[PATCH 0/1] MR8493: winegstreamer: Remove 'au' alignment for h264. - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8493

[Elizabeth Figura (＠zfigura)]

I guess, though I'd feel more comfortable explicitly writing nal here.

Actually, looking through h264parse, I don't see anything that falls back to nal if the alignment is missing?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8493#note_108761

[Dylan Donnell (＠dy-tea)]

Streams that are neither au-aligned nor nal-aligned should also be handled, as per the mentioned Wine bug.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8493#note_108764

[Elizabeth Figura (＠zfigura)]

Ah, I see, and looking more carefully, there is a "NONE" alignment that's used if the alignment is missing. I don't see any sign that there's an intended caps value for NONE alignment, so leaving the field out is probably indeed best.

However, that does mean the commit message is incorrect, and should not say 'nal'.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8493#note_108773