Zebediah Figura : winegstreamer: Inline init_new_decoded_pad() into pad_added_cb().
Module: wine Branch: master Commit: e4922b930b10c4006a81201481ffca6c448c05b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4922b930b10c4006a8120148... Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 16:07:01 2021 -0600 winegstreamer: Inline init_new_decoded_pad() into pad_added_cb(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 95e8611fb57..341ca182749 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -987,13 +987,19 @@ static struct wg_parser_stream *create_stream(struct wg_parser *parser) return stream; } -static void init_new_decoded_pad(GstElement *element, GstPad *pad, struct wg_parser *parser) +static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) { + struct wg_parser *parser = user; struct wg_parser_stream *stream; const char *name; GstCaps *caps; int ret; + GST_LOG("parser %p, element %p, pad %p.", parser, element, pad); + + if (gst_pad_is_linked(pad)) + return; + caps = gst_caps_make_writable(gst_pad_query_caps(pad, NULL)); name = gst_structure_get_name(gst_caps_get_structure(caps, 0)); @@ -1115,18 +1121,6 @@ out: gst_caps_unref(caps); } -static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) -{ - struct wg_parser *parser = user; - - GST_LOG("parser %p, element %p, pad %p.", parser, element, pad); - - if (gst_pad_is_linked(pad)) - return; - - init_new_decoded_pad(element, pad, parser); -} - static void pad_removed_cb(GstElement *element, GstPad *pad, gpointer user) { struct wg_parser *parser = user;
participants (1)
-
Alexandre Julliard