summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <olivier.crete@collabora.com>2015-03-17 17:55:26 -0400
committerTim-Philipp Müller <tim@centricular.com>2015-08-16 17:28:29 +0100
commit567b1e8c46f15c454de6320a393e720fb0f5b552 (patch)
tree1a9e0d3ec17b6945a75a7967fc34ef02a2788c09
parenta31a753bfd35f2260d6204b06862c0f2884cc62b (diff)
downloadgstreamer-plugins-bad-567b1e8c46f15c454de6320a393e720fb0f5b552.tar.gz
videoparsers: Use gst_base_parse_merge_tags()
Instead of squashing all upstream tags https://bugzilla.gnome.org/show_bug.cgi?id=679768
-rw-r--r--gst/videoparsers/gstdiracparse.c4
-rw-r--r--gst/videoparsers/gsth263parse.c4
-rw-r--r--gst/videoparsers/gsth264parse.c4
-rw-r--r--gst/videoparsers/gsth265parse.c4
-rw-r--r--gst/videoparsers/gstmpeg4videoparse.c4
-rw-r--r--gst/videoparsers/gstmpegvideoparse.c4
-rw-r--r--gst/videoparsers/gstpngparse.c4
-rw-r--r--gst/videoparsers/gstvc1parse.c4
8 files changed, 16 insertions, 16 deletions
diff --git a/gst/videoparsers/gstdiracparse.c b/gst/videoparsers/gstdiracparse.c
index f1ba133f3..ea3cd9dd6 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 18f9bf5f3..eb6290bd6 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 bd0162560..b43a81a02 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 3184b9beb..ecb8cf60b 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 89d7979e8..53db2d5ac 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 e64224aa8..54ee13b6d 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 154f81561..e08fe71b1 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 44b2c75fc..63de4e901 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;