Rémi Bernon : winegstreamer: Keep the input caps on the transform.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8ba713d6b80f3abbf32d573c8837ec3be30d784f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/8ba713d6b80f3abbf32d573c8837ec3...

Author: Rémi Bernon 
Date:   Tue Mar 12 18:20:48 2024 +0100

winegstreamer: Keep the input caps on the transform.

---

dlls/winegstreamer/wg_transform.c | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c
index a6f12d41080..ac036fcce59 100644
--- a/dlls/winegstreamer/wg_transform.c
+++ b/dlls/winegstreamer/wg_transform.c
@@ -61,6 +61,7 @@ struct wg_transform
     bool output_caps_changed;
     GstCaps *desired_caps;
     GstCaps *output_caps;
+    GstCaps *input_caps;
 };

static struct wg_transform *get_transform(wg_transform_t trans)
@@ -365,6 +366,7 @@ NTSTATUS wg_transform_destroy(void *args)
     gst_query_unref(transform->drain_query);
     gst_caps_unref(transform->desired_caps);
     gst_caps_unref(transform->output_caps);
+    gst_caps_unref(transform->input_caps);
     gst_atomic_queue_unref(transform->output_queue);
     free(transform);

@@ -405,7 +407,7 @@ NTSTATUS wg_transform_create(void *args)
 {
     struct wg_transform_create_params *params = args;
     GstElement *first = NULL, *last = NULL, *element;
-    GstCaps *sink_caps = NULL, *src_caps = NULL, *parsed_caps = NULL;
+    GstCaps *sink_caps = NULL, *parsed_caps = NULL;
     NTSTATUS status = STATUS_UNSUCCESSFUL;
     const gchar *input_mime, *output_mime;
     GstPadTemplate *template = NULL;
@@ -427,27 +429,31 @@ NTSTATUS wg_transform_create(void *args)
         goto out;
     transform->attrs = params->attrs;

+    if (!(transform->input_caps = caps_from_media_type(&params->input_type)))
+        goto out;
+    GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, transform->input_caps);
+    input_mime = gst_structure_get_name(gst_caps_get_structure(transform->input_caps, 0));
+
+    if (!(transform->output_caps = caps_from_media_type(&params->output_type)))
+        goto out;
+    GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps);
+    output_mime = gst_structure_get_name(gst_caps_get_structure(transform->output_caps, 0));
+
     if (IsEqualGUID(&params->input_type.major, &MFMediaType_Video))
         transform->input_info = params->input_type.u.video->videoInfo;
     if (IsEqualGUID(&params->output_type.major, &MFMediaType_Video))
         output_info = params->output_type.u.video->videoInfo;

-    if (!(src_caps = caps_from_media_type(&params->input_type)))
-        goto out;
-    if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps)))
+    if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, transform->input_caps)))
         goto out;
     transform->my_src = gst_pad_new_from_template(template, "src");
     g_object_unref(template);
     if (!transform->my_src)
         goto out;

-    GST_INFO("transform %p input caps %"GST_PTR_FORMAT, transform, src_caps);
-
     gst_pad_set_element_private(transform->my_src, transform);
     gst_pad_set_query_function(transform->my_src, transform_src_query_cb);

-    if (!(transform->output_caps = caps_from_media_type(&params->output_type)))
-        goto out;
     transform->desired_caps = gst_caps_ref(transform->output_caps);
     if (!(template = gst_pad_template_new("sink", GST_PAD_SINK, GST_PAD_ALWAYS, transform->output_caps)))
         goto out;
@@ -456,34 +462,30 @@ NTSTATUS wg_transform_create(void *args)
     if (!transform->my_sink)
         goto out;

-    GST_INFO("transform %p output caps %"GST_PTR_FORMAT, transform, transform->output_caps);
-
     gst_pad_set_element_private(transform->my_sink, transform);
     gst_pad_set_event_function(transform->my_sink, transform_sink_event_cb);
     gst_pad_set_query_function(transform->my_sink, transform_sink_query_cb);
     gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb);

-    input_mime = gst_structure_get_name(gst_caps_get_structure(src_caps, 0));
-    if (!(parsed_caps = transform_get_parsed_caps(src_caps, input_mime)))
+    if (!(parsed_caps = transform_get_parsed_caps(transform->input_caps, input_mime)))
         goto out;

/* Since we append conversion elements, we don't want to filter decoders
      * based on the actual output caps now. Matching decoders with the
      * raw output media type should be enough.
      */
-    output_mime = gst_structure_get_name(gst_caps_get_structure(transform->output_caps, 0));
     if (!(sink_caps = gst_caps_new_empty_simple(output_mime)))
         goto out;

if (strcmp(input_mime, "audio/x-raw") && strcmp(input_mime, "video/x-raw"))
     {
-        if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, src_caps, parsed_caps))
+        if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, transform->input_caps, parsed_caps))
                 && !append_element(transform->container, element, &first, &last))
             goto out;
         else if (!element)
         {
             gst_caps_unref(parsed_caps);
-            parsed_caps = gst_caps_ref(src_caps);
+            parsed_caps = gst_caps_ref(transform->input_caps);
         }

if (!(element = find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, parsed_caps, sink_caps))
@@ -560,7 +562,7 @@ NTSTATUS wg_transform_create(void *args)
     if (!(event = gst_event_new_stream_start("stream"))
             || !push_event(transform->my_src, event))
         goto out;
-    if (!(event = gst_event_new_caps(src_caps))
+    if (!(event = gst_event_new_caps(transform->input_caps))
             || !push_event(transform->my_src, event))
         goto out;

@@ -574,7 +576,6 @@ NTSTATUS wg_transform_create(void *args)
         goto out;

gst_caps_unref(parsed_caps);
-    gst_caps_unref(src_caps);
     gst_caps_unref(sink_caps);

GST_INFO("Created winegstreamer transform %p.", transform);
@@ -590,8 +591,8 @@ out:
         gst_caps_unref(transform->output_caps);
     if (transform->my_src)
         gst_object_unref(transform->my_src);
-    if (src_caps)
-        gst_caps_unref(src_caps);
+    if (transform->input_caps)
+        gst_caps_unref(transform->input_caps);
     if (parsed_caps)
         gst_caps_unref(parsed_caps);
     if (sink_caps)