From c6fd81963950a251bf3f0283a298e5d17b3c91da Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Mon, 10 Jul 2023 12:58:17 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 60 ++++++++++++++++++- ...er-Allow-rtp-caps-without-clock-rate.patch | 56 +++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch diff --git a/.gitignore b/.gitignore index ecb71dd..46c3807 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,60 @@ -SOURCES/gst-plugins-good-1.16.1.tar.xz +/gst-plugins-good-0.11.93.tar.xz +/gst-plugins-good-0.11.94.tar.xz +/gst-plugins-good-0.11.99.tar.xz +/gst-plugins-good-1.0.0.tar.xz +/gst-plugins-good-1.0.1.tar.xz +/gst-plugins-good-1.0.2.tar.xz +/gst-plugins-good-1.0.3.tar.xz +/gst-plugins-good-1.0.4.tar.xz +/gst-plugins-good-1.0.5.tar.xz +/gst-plugins-good-1.0.6.tar.xz +/gst-plugins-good-1.0.7.tar.xz +/gst-plugins-good-1.1.2.tar.xz +/gst-plugins-good-1.1.3.tar.xz +/gst-plugins-good-1.1.4.tar.xz +/gst-plugins-good-1.1.90.tar.xz +/gst-plugins-good-1.2.0.tar.xz +/gst-plugins-good-1.2.1.tar.xz +/gst-plugins-good-1.2.2.tar.xz +/gst-plugins-good-1.2.3.tar.xz +/gst-plugins-good-1.2.4.tar.xz +/gst-plugins-good-1.3.91.tar.xz +/gst-plugins-good-1.4.0.tar.xz +/gst-plugins-good-1.4.1.tar.xz +/gst-plugins-good-1.4.2.tar.xz +/gst-plugins-good-1.4.4.tar.xz +/gst-plugins-good-1.4.5.tar.xz +/gst-plugins-good-1.5.1.tar.xz +/gst-plugins-good-1.5.2.tar.xz +/gst-plugins-good-1.5.90.tar.xz +/gst-plugins-good-1.5.91.tar.xz +/gst-plugins-good-1.6.0.tar.xz +/gst-plugins-good-1.6.1.tar.xz +/gst-plugins-good-1.6.2.tar.xz +/gst-plugins-good-1.7.1.tar.xz +/gst-plugins-good-1.7.2.tar.xz +/gst-plugins-good-1.7.90.tar.xz +/gst-plugins-good-1.7.91.tar.xz +/gst-plugins-good-1.8.0.tar.xz +/gst-plugins-good-1.8.1.tar.xz +/gst-plugins-good-1.8.2.tar.xz +/gst-plugins-good-1.9.1.tar.xz +/gst-plugins-good-1.9.2.tar.xz +/gst-plugins-good-1.9.90.tar.xz +/gst-plugins-good-1.10.0.tar.xz +/gst-plugins-good-1.10.1.tar.xz +/gst-plugins-good-1.10.2.tar.xz +/gst-plugins-good-1.11.1.tar.xz +/gst-plugins-good-1.11.2.tar.xz +/gst-plugins-good-1.11.90.tar.xz +/gst-plugins-good-1.11.91.tar.xz +/gst-plugins-good-1.12.0.tar.xz +/gst-plugins-good-1.12.1.tar.xz +/gst-plugins-good-1.12.2.tar.xz +/gst-plugins-good-1.12.3.tar.xz +/gst-plugins-good-1.12.4.tar.xz +/gst-plugins-good-1.13.1.tar.xz +/gst-plugins-good-1.13.90.tar.xz +/gst-plugins-good-1.13.91.tar.xz +/gst-plugins-good-1.14.0.tar.xz /gst-plugins-good-1.16.1.tar.xz diff --git a/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch b/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch new file mode 100644 index 0000000..f7b5365 --- /dev/null +++ b/0001-jitterbuffer-Allow-rtp-caps-without-clock-rate.patch @@ -0,0 +1,56 @@ +From a98341397d3522fdc7470c4220775035a2d1d790 Mon Sep 17 00:00:00 2001 +From: Youness Alaoui +Date: Thu, 7 Aug 2014 21:58:14 -0400 +Subject: [PATCH] jitterbuffer: Allow rtp caps without clock-rate + +The jitterbuffer shouldn't force clock-rate on its sink pad, this will cause a negotiation issue since rtpssrcdemux doesn't have the clock-rate and doesn't add it to the caps. The documentation states that the clock-rate can either be specified through the caps or through the request-pt-map signal, so we must remove clock-rate from the pad templates and we must accept the GST_EVENT_CAPS if the caps don't have the clock-rate. + +https://bugzilla.gnome.org/show_bug.cgi?id=734322 +--- + gst/rtpmanager/gstrtpjitterbuffer.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c +index c8c512e..0eccd1a 100644 +--- a/gst/rtpmanager/gstrtpjitterbuffer.c ++++ b/gst/rtpmanager/gstrtpjitterbuffer.c +@@ -342,9 +342,9 @@ static GstStaticPadTemplate gst_rtp_jitter_buffer_sink_template = + GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, +- GST_STATIC_CAPS ("application/x-rtp, " +- "clock-rate = (int) [ 1, 2147483647 ]" +- /* "payload = (int) , " ++ GST_STATIC_CAPS ("application/x-rtp" ++ /* "clock-rate = (int) [ 1, 2147483647 ], " ++ * "payload = (int) , " + * "encoding-name = (string) " + */ ) + ); +@@ -1364,9 +1364,7 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) + GstCaps *caps; + + gst_event_parse_caps (event, &caps); +- if (!gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps)) +- goto wrong_caps; +- ++ gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps); + break; + } + case GST_EVENT_SEGMENT: +@@ -1397,12 +1395,6 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) + return TRUE; + + /* ERRORS */ +-wrong_caps: +- { +- GST_DEBUG_OBJECT (jitterbuffer, "received invalid caps"); +- gst_event_unref (event); +- return FALSE; +- } + newseg_wrong_format: + { + GST_DEBUG_OBJECT (jitterbuffer, "received non TIME newsegment"); +-- +2.1.0 +