mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 03:01:03 +00:00
52eaafcd6c
This is a quick fix for regression introduced by the upstream
commit e8908f5aee in h264 videoparser.
The patch is disabling the passthrough mode, otherwise it will
break multi-layer mvc stream parsing.
https://bugzilla.gnome.org/show_bug.cgi?id=758656
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From aaf9569d096392d73f45bcf9973d58b90a7ecd27 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
|
|
<victorx.jaquez@intel.com>
|
|
Date: Mon, 14 Sep 2015 19:11:59 +0200
|
|
Subject: [PATCH 6/6] h265parse: fix build with GStreamer < 1.5
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
|
|
---
|
|
gst/vaapi/gsth265parse.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/gst/vaapi/gsth265parse.c b/gst/vaapi/gsth265parse.c
|
|
index 5f65ab6..35b0812 100644
|
|
--- a/gst/vaapi/gsth265parse.c
|
|
+++ b/gst/vaapi/gsth265parse.c
|
|
@@ -141,8 +141,12 @@ gst_h265_parse_init (GstH265Parse * h265parse)
|
|
{
|
|
h265parse->frame_out = gst_adapter_new ();
|
|
gst_base_parse_set_pts_interpolation (GST_BASE_PARSE (h265parse), FALSE);
|
|
+#if GST_CHECK_VERSION(1,3,0)
|
|
GST_PAD_SET_ACCEPT_INTERSECT (GST_BASE_PARSE_SINK_PAD (h265parse));
|
|
+#endif
|
|
+#if GST_CHECK_VERSION(1,5,0)
|
|
GST_PAD_SET_ACCEPT_TEMPLATE (GST_BASE_PARSE_SINK_PAD (h265parse));
|
|
+#endif
|
|
}
|
|
|
|
|
|
@@ -1774,8 +1778,14 @@ gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
|
|
GST_TAG_VIDEO_CODEC, caps);
|
|
gst_caps_unref (caps);
|
|
|
|
+#if GST_CHECK_VERSION(1,5,0)
|
|
gst_base_parse_merge_tags (parse, taglist, GST_TAG_MERGE_REPLACE);
|
|
gst_tag_list_unref (taglist);
|
|
+#else
|
|
+ gst_pad_push_event (GST_BASE_PARSE_SRC_PAD (h265parse),
|
|
+ gst_event_new_tag (taglist));
|
|
+#endif
|
|
+
|
|
|
|
/* also signals the end of first-frame processing */
|
|
h265parse->sent_codec_tag = TRUE;
|
|
--
|
|
2.5.1
|