[PATCH v3 0/2] MR5405: winegstreamer: Fallback to input caps only when no parser was found.

[Rémi Bernon]

Which is what !5255 was supposed to do.

--
  v3: winegstreamer: Fallback to input caps only when no parser was found.
      winegstreamer: Create the transform parsed caps from wg_format.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5405

[PATCH v3 1/2] winegstreamer: Create the transform parsed caps from wg_format.

[Rémi Bernon]

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

---
 dlls/winegstreamer/wg_transform.c | 55 ++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 71ea8cd263c..3ddf7c19e25 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -332,6 +332,59 @@ static bool wg_format_video_is_flipped(const struct wg_format *format)
     return format->major_type == WG_MAJOR_TYPE_VIDEO && (format->u.video.height < 0);
 }
 
+static GstCaps *transform_get_parsed_caps(struct wg_format *format, const char *media_type)
+{
+    GstCaps *parsed_caps;
+
+    if (!(parsed_caps = gst_caps_new_empty_simple(media_type)))
+        return NULL;
+
+    switch (format->major_type)
+    {
+        case WG_MAJOR_TYPE_AUDIO_MPEG1:
+            gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 1,
+                    "layer", G_TYPE_INT, format->u.audio_mpeg1.layer, NULL);
+            break;
+        case WG_MAJOR_TYPE_AUDIO_MPEG4:
+            gst_caps_set_simple(parsed_caps, "framed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 4, NULL);
+            break;
+        case WG_MAJOR_TYPE_AUDIO_WMA:
+            gst_caps_set_simple(parsed_caps, "wmaversion", G_TYPE_INT, format->u.audio_wma.version, NULL);
+            break;
+        case WG_MAJOR_TYPE_VIDEO_H264:
+            gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, NULL);
+            break;
+        case WG_MAJOR_TYPE_VIDEO_MPEG1:
+            gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 1, NULL);
+            break;
+        case WG_MAJOR_TYPE_VIDEO_WMV:
+            switch (format->u.video_wmv.format)
+            {
+                case WG_WMV_VIDEO_FORMAT_WMV1:
+                    gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 1, NULL);
+                    break;
+                case WG_WMV_VIDEO_FORMAT_WMV2:
+                    gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 2, NULL);
+                    break;
+                case WG_WMV_VIDEO_FORMAT_WMV3:
+                case WG_WMV_VIDEO_FORMAT_WMVA:
+                case WG_WMV_VIDEO_FORMAT_WVC1:
+                    gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 3, NULL);
+                    break;
+                default:
+                    GST_WARNING("Unknown WMV format %u.", format->u.video_wmv.format);
+                    break;
+            }
+            break;
+        case WG_MAJOR_TYPE_AUDIO:
+        case WG_MAJOR_TYPE_VIDEO:
+        case WG_MAJOR_TYPE_UNKNOWN:
+            break;
+    }
+
+    return parsed_caps;
+}
+
 NTSTATUS wg_transform_create(void *args)
 {
     struct wg_transform_create_params *params = args;
@@ -391,7 +444,7 @@ NTSTATUS wg_transform_create(void *args)
     gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb);
 
     media_type = gst_structure_get_name(gst_caps_get_structure(src_caps, 0));
-    if (!(parsed_caps = gst_caps_new_empty_simple(media_type)))
+    if (!(parsed_caps = transform_get_parsed_caps(&input_format, media_type)))
         goto out;
 
     /* Since we append conversion elements, we don't want to filter decoders
-- 
GitLab


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

[PATCH v3 2/2] winegstreamer: Fallback to input caps only when no parser was found.

[Rémi Bernon]

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

---
 dlls/winegstreamer/wg_transform.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index 3ddf7c19e25..aabe618972d 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -468,7 +468,7 @@ NTSTATUS wg_transform_create(void *args)
             if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, src_caps, parsed_caps))
                     && !append_element(transform->container, element, &first, &last))
                 goto out;
-            else
+            else if (!element)
             {
                 gst_caps_unref(parsed_caps);
                 parsed_caps = gst_caps_ref(src_caps);
-- 
GitLab

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

[Rémi Bernon]

v3: Fixed a typo in mpeg video version.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5405#note_66388

[PATCH v3 0/2] MR5405: winegstreamer: Fallback to input caps only when no parser was found. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5405