From 567b1e8c46f15c454de6320a393e720fb0f5b552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 17 Mar 2015 17:55:26 -0400 Subject: [PATCH] videoparsers: Use gst_base_parse_merge_tags() Instead of squashing all upstream tags https://bugzilla.gnome.org/show_bug.cgi?id=679768 --- gst/videoparsers/gstdiracparse.c | 4 ++-- gst/videoparsers/gsth263parse.c | 4 ++-- gst/videoparsers/gsth264parse.c | 4 ++-- gst/videoparsers/gsth265parse.c | 4 ++-- gst/videoparsers/gstmpeg4videoparse.c | 4 ++-- gst/videoparsers/gstmpegvideoparse.c | 4 ++-- gst/videoparsers/gstpngparse.c | 4 ++-- gst/videoparsers/gstvc1parse.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gst/videoparsers/gstdiracparse.c b/gst/videoparsers/gstdiracparse.c index f1ba133f3f..ea3cd9dd6a 100644 --- a/gst/videoparsers/gstdiracparse.c +++ b/gst/videoparsers/gstdiracparse.c @@ -404,8 +404,8 @@ gst_dirac_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (diracparse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ diracparse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gsth263parse.c b/gst/videoparsers/gsth263parse.c index 18f9bf5f30..eb6290bd6b 100644 --- a/gst/videoparsers/gsth263parse.c +++ b/gst/videoparsers/gsth263parse.c @@ -447,8 +447,8 @@ gst_h263_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h263parse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ h263parse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c index bd01625600..b43a81a029 100644 --- a/gst/videoparsers/gsth264parse.c +++ b/gst/videoparsers/gsth264parse.c @@ -2213,8 +2213,8 @@ gst_h264_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h264parse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ h264parse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gsth265parse.c b/gst/videoparsers/gsth265parse.c index 3184b9bebc..ecb8cf60b8 100644 --- a/gst/videoparsers/gsth265parse.c +++ b/gst/videoparsers/gsth265parse.c @@ -1772,8 +1772,8 @@ gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h265parse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ h265parse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c index 89d7979e8a..53db2d5ac8 100644 --- a/gst/videoparsers/gstmpeg4videoparse.c +++ b/gst/videoparsers/gstmpeg4videoparse.c @@ -730,8 +730,8 @@ gst_mpeg4vparse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (mp4vparse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ mp4vparse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gstmpegvideoparse.c b/gst/videoparsers/gstmpegvideoparse.c index e64224aa89..54ee13b6de 100644 --- a/gst/videoparsers/gstmpegvideoparse.c +++ b/gst/videoparsers/gstmpegvideoparse.c @@ -954,8 +954,8 @@ gst_mpegv_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (parse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); mpvparse->send_codec_tag = FALSE; } diff --git a/gst/videoparsers/gstpngparse.c b/gst/videoparsers/gstpngparse.c index 154f81561b..e08fe71b15 100644 --- a/gst/videoparsers/gstpngparse.c +++ b/gst/videoparsers/gstpngparse.c @@ -267,8 +267,8 @@ gst_png_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (pngparse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ pngparse->sent_codec_tag = TRUE; diff --git a/gst/videoparsers/gstvc1parse.c b/gst/videoparsers/gstvc1parse.c index 44b2c75fca..63de4e9010 100644 --- a/gst/videoparsers/gstvc1parse.c +++ b/gst/videoparsers/gstvc1parse.c @@ -1708,8 +1708,8 @@ gst_vc1_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) GST_TAG_VIDEO_CODEC, caps); gst_caps_unref (caps); - gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (vc1parse), - gst_event_new_tag (taglist)); + gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE); + gst_tag_list_unref (taglist); /* also signals the end of first-frame processing */ vc1parse->sent_codec_tag = TRUE;