GStreamer already adds one.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/winegstreamer/wg_format.c | 4 ++-- dlls/winegstreamer/wg_parser.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/winegstreamer/wg_format.c b/dlls/winegstreamer/wg_format.c index 40b9acfefff..fc50fad6d12 100644 --- a/dlls/winegstreamer/wg_format.c +++ b/dlls/winegstreamer/wg_format.c @@ -327,12 +327,12 @@ static void wg_channel_mask_to_gst(GstAudioChannelPosition *positions, uint32_t if (bit < ARRAY_SIZE(position_map)) positions[i] = position_map[bit]; else - GST_WARNING("Invalid channel mask %#x.\n", orig_mask); + GST_WARNING("Invalid channel mask %#x.", orig_mask); mask &= ~(1 << bit); } else { - GST_WARNING("Incomplete channel mask %#x.\n", orig_mask); + GST_WARNING("Incomplete channel mask %#x.", orig_mask); } } } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 5a2e970a4dd..37da2d1e1c4 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1443,7 +1443,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser)
if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; }
@@ -1472,7 +1472,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser)
if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.", ret); return FALSE; }
@@ -1493,7 +1493,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; }
@@ -1503,7 +1503,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1527,7 +1527,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - GST_ERROR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.", ret); return FALSE; }
@@ -1538,7 +1538,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - GST_ERROR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.", ret); return FALSE; } gst_pad_set_active(stream->my_sink, 1); @@ -1566,7 +1566,7 @@ static void init_gstreamer_once(void)
GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support");
- GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.", gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); }
@@ -1604,7 +1604,7 @@ static NTSTATUS wg_parser_create(void *args) parser->init_gst = init_funcs[params->type]; parser->unlimited_buffering = params->unlimited_buffering;
- GST_DEBUG("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.", parser); params->parser = parser; return S_OK; }
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/winegstreamer/wg_transform.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index e4545774428..c52650b80d9 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -44,6 +44,7 @@ GST_DEBUG_CATEGORY_EXTERN(wine);
struct wg_transform { + GstElement *container; GstPad *my_src, *my_sink; };
@@ -62,6 +63,12 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args;
+ if (transform->container) + gst_element_set_state(transform->container, GST_STATE_NULL); + + if (transform->container) + g_object_unref(transform->container); + if (transform->my_sink) g_object_unref(transform->my_sink); if (transform->my_src) @@ -80,6 +87,7 @@ NTSTATUS wg_transform_create(void *args) GstPadTemplate *template = NULL; struct wg_transform *transform; NTSTATUS status; + int ret;
if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; @@ -94,6 +102,9 @@ NTSTATUS wg_transform_create(void *args) if (!(sink_caps = wg_format_to_caps(&output_format))) goto done;
+ if (!(transform->container = gst_bin_new("wg_transform"))) + goto done; + if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) goto done; if (!(transform->my_src = gst_pad_new_from_template(template, "src"))) @@ -111,6 +122,13 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb);
+ status = STATUS_UNSUCCESSFUL; + + gst_element_set_state(transform->container, GST_STATE_PAUSED); + ret = gst_element_get_state(transform->container, NULL, NULL, -1); + if (ret == GST_STATE_CHANGE_FAILURE) + goto done; + status = STATUS_SUCCESS;
done:
Sorry for the slow review here; I meant to reply earlier but had a computer part die on me...
On 2/18/22 11:27, Rémi Bernon wrote:
@@ -62,6 +63,12 @@ NTSTATUS wg_transform_destroy(void *args) { struct wg_transform *transform = args;
- if (transform->container)
gst_element_set_state(transform->container, GST_STATE_NULL);- if (transform->container)
g_object_unref(transform->container);
These conditions can be collapsed.
Actually I'm not much of a fan of calling destruction functions from the error path of the corresponding creation function like this; I find it tends to lead to problems later.
@@ -111,6 +122,13 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_element_private(transform->my_sink, transform); gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb);
- status = STATUS_UNSUCCESSFUL;
- gst_element_set_state(transform->container, GST_STATE_PAUSED);
- ret = gst_element_get_state(transform->container, NULL, NULL, -1);
- if (ret == GST_STATE_CHANGE_FAILURE)
goto done;
I'd rather set "status" inside the if block here.
(Although given that we never interpret the status value, there doesn't seem to be much point in setting it to anything specific; i.e. we could just always set it to STATUS_UNSUCCESSFUL and have done.)
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/wg_parser.c | 2 +- dlls/winegstreamer/wg_transform.c | 47 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f9c4da2f6ea..d3f32484ee6 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -26,6 +26,7 @@ #include <gst/gst.h>
extern bool init_gstreamer(void) DECLSPEC_HIDDEN; +extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN;
extern void wg_format_from_caps(struct wg_format *format, const GstCaps *caps) DECLSPEC_HIDDEN; extern bool wg_format_compare(const struct wg_format *a, const struct wg_format *b) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 37da2d1e1c4..d9bbc60964e 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -699,7 +699,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) } }
-static GstElement *create_element(const char *name, const char *plugin_set) +GstElement *create_element(const char *name, const char *plugin_set) { GstElement *element;
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index c52650b80d9..120d9fcf1a5 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -78,11 +78,41 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; }
+static bool transform_append_element(struct wg_transform *transform, GstElement *element, + GstElement **first, GstElement **last) +{ + gchar *name = gst_element_get_name(element); + + if (!gst_bin_add(GST_BIN(transform->container), element)) + { + GST_ERROR("Failed to add %s element to bin.", name); + g_free(name); + return false; + } + + if (*last && !gst_element_link(*last, element)) + { + GST_ERROR("Failed to link %s element.", name); + g_free(name); + return false; + } + + GST_DEBUG("Appended %s element %p.", name, element); + g_free(name); + + if (!*first) + *first = element; + + *last = element; + return true; +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; + GstElement *first = NULL, *last = NULL, *element; GstCaps *src_caps = NULL, *sink_caps = NULL; GstPadTemplate *template = NULL; struct wg_transform *transform; @@ -105,6 +135,23 @@ NTSTATUS wg_transform_create(void *args) if (!(transform->container = gst_bin_new("wg_transform"))) goto done;
+ switch (output_format.major_type) + { + case WG_MAJOR_TYPE_AUDIO: + if (!(element = create_element("audioconvert", "base")) || + !transform_append_element(transform, element, &first, &last)) + goto done; + if (!(element = create_element("audioresample", "base")) || + !transform_append_element(transform, element, &first, &last)) + goto done; + break; + case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_WMA: + case WG_MAJOR_TYPE_UNKNOWN: + GST_FIXME("Format %u not implemented!", output_format.major_type); + goto done; + } + if (!(template = gst_pad_template_new("src", GST_PAD_SRC, GST_PAD_ALWAYS, src_caps))) goto done; if (!(transform->my_src = gst_pad_new_from_template(template, "src")))
On 2/18/22 11:27, Rémi Bernon wrote:
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com
dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/wg_parser.c | 2 +- dlls/winegstreamer/wg_transform.c | 47 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-)
It'd be nice to have a brief description of why these are necessary, either in the commit message or (ideally) in the code itself.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/winegstreamer/wg_transform.c | 66 ++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 120d9fcf1a5..22d97aa1241 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -78,6 +78,50 @@ NTSTATUS wg_transform_destroy(void *args) return STATUS_SUCCESS; }
+static GstElement *tranform_find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) +{ + GstElement *element = NULL; + GList *tmp, *transforms; + gchar *name; + + transforms = gst_element_factory_list_get_elements(type, GST_RANK_MARGINAL); + if (!transforms) + goto done; + + tmp = gst_element_factory_list_filter(transforms, src_caps, GST_PAD_SINK, FALSE); + gst_plugin_feature_list_free(transforms); + if (!(transforms = tmp)) + goto done; + + tmp = gst_element_factory_list_filter(transforms, sink_caps, GST_PAD_SRC, FALSE); + gst_plugin_feature_list_free(transforms); + if (!(transforms = tmp)) + goto done; + + transforms = g_list_sort(transforms, gst_plugin_feature_rank_compare_func); + for (tmp = transforms; tmp != NULL && element == NULL; tmp = tmp->next) + { + name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(tmp->data)); + element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL); + if (!element) + GST_WARNING("Failed to create %s element.", name); + } + gst_plugin_feature_list_free(transforms); + +done: + if (element) + GST_DEBUG("Created %s element %p.", name, element); + else + { + gchar *src_str = gst_caps_to_string(src_caps), *sink_str = gst_caps_to_string(sink_caps); + GST_WARNING("Failed to create transform matching caps %s / %s.", src_str, sink_str); + g_free(sink_str); + g_free(src_str); + } + + return element; +} + static bool transform_append_element(struct wg_transform *transform, GstElement *element, GstElement **first, GstElement **last) { @@ -110,12 +154,13 @@ static bool transform_append_element(struct wg_transform *transform, GstElement NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; + GstCaps *raw_caps = NULL, *src_caps = NULL, *sink_caps = NULL; struct wg_format output_format = *params->output_format; struct wg_format input_format = *params->input_format; GstElement *first = NULL, *last = NULL, *element; - GstCaps *src_caps = NULL, *sink_caps = NULL; GstPadTemplate *template = NULL; struct wg_transform *transform; + const gchar *media_type; NTSTATUS status; int ret;
@@ -131,10 +176,27 @@ NTSTATUS wg_transform_create(void *args) goto done; if (!(sink_caps = wg_format_to_caps(&output_format))) goto done; + media_type = gst_structure_get_name(gst_caps_get_structure(sink_caps, 0)); + if (!(raw_caps = gst_caps_new_empty_simple(media_type))) + goto done;
if (!(transform->container = gst_bin_new("wg_transform"))) goto done;
+ switch (input_format.major_type) + { + case WG_MAJOR_TYPE_WMA: + if (!(element = tranform_find_element(GST_ELEMENT_FACTORY_TYPE_DECODER, src_caps, raw_caps)) || + !transform_append_element(transform, element, &first, &last)) + goto done; + break; + case WG_MAJOR_TYPE_AUDIO: + case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_UNKNOWN: + GST_FIXME("Format %u not implemented!", input_format.major_type); + goto done; + } + switch (output_format.major_type) { case WG_MAJOR_TYPE_AUDIO: @@ -181,6 +243,8 @@ NTSTATUS wg_transform_create(void *args) done: if (template) g_object_unref(template); + if (raw_caps) + gst_caps_unref(raw_caps); if (sink_caps) gst_caps_unref(sink_caps); if (src_caps)
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/winegstreamer/wg_transform.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 22d97aa1241..8ae0ad5127f 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -46,6 +46,7 @@ struct wg_transform { GstElement *container; GstPad *my_src, *my_sink; + GstPad *their_sink, *their_src; };
static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -66,6 +67,16 @@ NTSTATUS wg_transform_destroy(void *args) if (transform->container) gst_element_set_state(transform->container, GST_STATE_NULL);
+ if (transform->their_src && transform->my_sink) + gst_pad_unlink(transform->their_src, transform->my_sink); + if (transform->their_sink && transform->my_src) + gst_pad_unlink(transform->my_src, transform->their_sink); + + if (transform->their_sink) + g_object_unref(transform->their_sink); + if (transform->their_src) + g_object_unref(transform->their_src); + if (transform->container) g_object_unref(transform->container);
@@ -233,6 +244,21 @@ NTSTATUS wg_transform_create(void *args)
status = STATUS_UNSUCCESSFUL;
+ if (!(transform->their_sink = gst_element_get_static_pad(first, "sink"))) + goto done; + if (!(transform->their_src = gst_element_get_static_pad(last, "src"))) + goto done; + + if ((ret = gst_pad_link(transform->my_src, transform->their_sink)) < 0) + goto done; + if ((ret = gst_pad_link(transform->their_src, transform->my_sink)) < 0) + goto done; + + if (!(ret = gst_pad_set_active(transform->my_sink, 1))) + goto done; + if (!(ret = gst_pad_set_active(transform->my_src, 1))) + goto done; + gst_element_set_state(transform->container, GST_STATE_PAUSED); ret = gst_element_get_state(transform->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE)
-
Rémi Bernon -
Zebediah Figura