Fix preroll on some DVDs (#1196411)

.gitignore

@@ -22,3 +22,6 @@
 /gst-plugins-bad-free-1.4.0.tar.xz
 /gst-plugins-bad-free-1.4.1.tar.xz
 /gst-plugins-bad-free-1.4.2.tar.xz
+/gst-plugins-bad-free-1.4.4.tar.xz
+/gst-plugins-bad-1.4.5.tar.xz
+/gst-plugins-bad-free-1.4.5.tar.xz

0001-resindvd-Don-t-send-meaningless-segment-position-dow.patch

@@ -0,0 +1,62 @@
+From 69e004344a74a7bd3ef7eac6812a696882d7af43 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <jan@centricular.com>
+Date: Sun, 8 Feb 2015 04:51:13 +1100
+Subject: [PATCH] resindvd: Don't send meaningless segment position downstream
+
+Don't place a meaningless value in the position field in
+outgoing segments - values have to be in the range start->stop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740558
+---
+ ext/resindvd/gstmpegdemux.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/ext/resindvd/gstmpegdemux.c b/ext/resindvd/gstmpegdemux.c
+index fcf9d75..7753514 100644
+--- a/ext/resindvd/gstmpegdemux.c
++++ b/ext/resindvd/gstmpegdemux.c
+@@ -942,22 +942,20 @@ gst_flups_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+       demux->bytes_since_scr = 0;
+ 
+       GST_DEBUG_OBJECT (demux,
+-          "demux: received new segment start %" G_GINT64_FORMAT " stop %"
+-          G_GINT64_FORMAT " time %" G_GINT64_FORMAT
+-          " base %" G_GINT64_FORMAT, start, stop, time, base);
++          "demux: received new segment %" GST_SEGMENT_FORMAT,
++          &demux->sink_segment);
+ #if 0
+       g_print ("demux: received new segment start %" G_GINT64_FORMAT " stop %"
+           G_GINT64_FORMAT " time %" G_GINT64_FORMAT
+           " base %" G_GINT64_FORMAT "\n", start, stop, time, base);
+ #endif
+-      position = base - start;
+-      adjust = position + SCR_MUNGE;
++      adjust = base - start + SCR_MUNGE;
+       if (adjust >= 0)
+         demux->scr_adjust = GSTTIME_TO_MPEGTIME (adjust);
+       else
+         demux->scr_adjust = -GSTTIME_TO_MPEGTIME (-adjust);
+ 
+-      start = SCR_MUNGE;
++      position = start = SCR_MUNGE;
+       base = 0;
+ 
+       if (stop != -1)
+@@ -973,12 +971,9 @@ gst_flups_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+       demux->src_segment.position = position;
+ 
+       GST_DEBUG_OBJECT (demux,
+-          "sending new segment: rate %g format %d, start: %"
+-          G_GINT64_FORMAT ", stop: %" G_GINT64_FORMAT ", time: %"
+-          G_GINT64_FORMAT ", base: %" G_GINT64_FORMAT
++          "sending new segment %" GST_SEGMENT_FORMAT
+           ", scr_adjust: %" G_GINT64_FORMAT "(%" GST_TIME_FORMAT ")",
+-          segment->rate, segment->format, start, stop, time, base,
+-          demux->scr_adjust,
++          &demux->src_segment, demux->scr_adjust,
+           GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->scr_adjust)));
+ #if 0
+       g_print ("sending new segment: rate %g format %d, start: %"
+-- 
+2.4.2
+

0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch

@@ -0,0 +1,47 @@
+From 3c8039642448e7ad383b2cd588f54e396e1788a8 Mon Sep 17 00:00:00 2001
+From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
+Date: Tue, 5 Aug 2014 14:06:07 -0400
+Subject: [PATCH] srtpdec: Add support for RTP/RTCP mixing if data arrives on
+ RTCP pad
+
+https://bugzilla.gnome.org/show_bug.cgi?id=734321
+---
+ ext/srtp/gstsrtpdec.c | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c
+index 5d42f44..892f683 100644
+--- a/ext/srtp/gstsrtpdec.c
++++ b/ext/srtp/gstsrtpdec.c
+@@ -560,20 +560,18 @@ validate_buffer (GstSrtpDec * filter, GstBuffer * buf, guint32 * ssrc,
+     gboolean * is_rtcp)
+ {
+   GstSrtpDecSsrcStream *stream = NULL;
++  GstRTPBuffer rtpbuf = GST_RTP_BUFFER_INIT;
+ 
+-  if (!(*is_rtcp)) {
+-    GstRTPBuffer rtpbuf = GST_RTP_BUFFER_INIT;
++  if (gst_rtp_buffer_map (buf, GST_MAP_READ, &rtpbuf)) {
++    if (gst_rtp_buffer_get_payload_type (&rtpbuf) < 64
++        || gst_rtp_buffer_get_payload_type (&rtpbuf) > 80) {
++      *ssrc = gst_rtp_buffer_get_ssrc (&rtpbuf);
+ 
+-    if (gst_rtp_buffer_map (buf, GST_MAP_READ, &rtpbuf)) {
+-      if (gst_rtp_buffer_get_payload_type (&rtpbuf) < 64
+-          || gst_rtp_buffer_get_payload_type (&rtpbuf) > 80) {
+-        *ssrc = gst_rtp_buffer_get_ssrc (&rtpbuf);
+-
+-        gst_rtp_buffer_unmap (&rtpbuf);
+-        goto have_ssrc;
+-      }
+       gst_rtp_buffer_unmap (&rtpbuf);
++      *is_rtcp = FALSE;
++      goto have_ssrc;
+     }
++    gst_rtp_buffer_unmap (&rtpbuf);
+   }
+ 
+   if (rtcp_buffer_get_ssrc (buf, ssrc)) {
+-- 
+2.1.0
+

gstreamer1-plugins-bad-free.spec

@@ -9,8 +9,8 @@
 %endif
 
 Name:           gstreamer1-plugins-bad-free
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.4.5
+Release:        3%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
@@ -20,6 +20,8 @@ URL:            http://gstreamer.freedesktop.org/
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 Source0:        gst-plugins-bad-free-%{version}.tar.xz
 Source1:        gst-p-bad-cleanup.sh
+Patch1:         0001-srtpdec-Add-support-for-RTP-RTCP-mixing-if-data-arri.patch
+Patch2:         0001-resindvd-Don-t-send-meaningless-segment-position-dow.patch
 
 BuildRequires:  gstreamer1-devel >= %{version}
 BuildRequires:  gstreamer1-plugins-base-devel >= %{version}
@@ -49,7 +51,11 @@ BuildRequires:  orc-devel
 BuildRequires:  soundtouch-devel
 BuildRequires:  wavpack-devel
 BuildRequires:  opus-devel
+BuildRequires:  nettle-devel
+BuildRequires:  libgcrypt-devel
+%if 0%{?fedora}
 BuildRequires:  libwayland-client-devel
+%endif
 BuildRequires:  gnutls-devel
 BuildRequires:  libsrtp-devel
 
@@ -143,6 +149,8 @@ aren't tested well enough, or the code is not of good enough quality.
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
+%patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -190,7 +198,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/libgstmpegts-%{majorminor}.so.*
 %{_libdir}/libgstphotography-%{majorminor}.so.*
 %{_libdir}/libgsturidownloader-%{majorminor}.so.*
+%if 0%{?fedora}
 %{_libdir}/libgstwayland-%{majorminor}.so.*
+%endif
 
 %{_libdir}/girepository-1.0/GstInsertBin-1.0.typelib
 %{_libdir}/girepository-1.0/GstMpegts-1.0.typelib
@@ -211,7 +221,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/gstreamer-%{majorminor}/libgstcompositor.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdashdemux.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdataurisrc.so
+%if %{with extras}
 %{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
+%endif
 %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfieldanalysis.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfreeverb.so
@@ -248,7 +260,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
 %{_libdir}/gstreamer-%{majorminor}/libgststereo.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
+%if %{with extras}
 %{_libdir}/gstreamer-%{majorminor}/libgstvdpau.so
+%endif
 %{_libdir}/gstreamer-%{majorminor}/libgstvideofiltersbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so
@@ -266,9 +280,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/gstreamer-%{majorminor}/libgstladspa.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopengl.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopus.so
+%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
+%if 0%{?fedora}
 %{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so
+%endif
 
 #debugging plugin
 %{_libdir}/gstreamer-%{majorminor}/libgstdebugutilsbad.so
@@ -284,7 +301,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
 %{_libdir}/gstreamer-%{majorminor}/libgstopenexr.so
 %{_libdir}/gstreamer-%{majorminor}/libgstschro.so
-%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
 %{_libdir}/gstreamer-%{majorminor}/libgstzbar.so
 %{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
 
@@ -311,7 +327,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/libgstmpegts-%{majorminor}.so
 %{_libdir}/libgstphotography-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
+%if 0%{?fedora}
 %{_libdir}/libgstwayland-%{majorminor}.so
+%endif
 
 %{_includedir}/gstreamer-%{majorminor}/gst/basecamerabinsrc
 %{_includedir}/gstreamer-%{majorminor}/gst/codecparsers
@@ -329,6 +347,21 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/libgstcamerab
 %{_libdir}/pkgconfig/gstreamer-plugins-bad-%{majorminor}.pc
 
 %changelog
+* Mon Jun 15 2015 Wim Taymans <wtaymans@redhat.com> - 1.4.5-3
+- Fix preroll on some DVDs (#1196411)
+
+* Fri Mar 06 2015 David Woodhouse <dwmw2@infradead.org> - 1.4.5-2
+- Fix RTP/RTCP muxing (#1199578)
+
+* Wed Jan 28 2015 Bastien Nocera <bnocera@redhat.com> 1.4.5-1
+- Update to 1.4.5
+
+* Fri Nov 14 2014 Kalev Lember <kalevlember@gmail.com> - 1.4.4-1
+- Update to 1.4.4
+
+* Tue Nov 04 2014 Richard Hughes <rhughes@redhat.com> - 1.4.2-3
+- Fix non-Fedora build
+
 * Mon Sep 22 2014 Wim Taymans <wtaymans@redhat.com> - 1.4.2-2
 - Remove celt buildreq, the plugin was removed and so is celt-devel
 

sources

@@ -1 +1 @@
-59e1a1d0282f746f70500858f93c6fea  gst-plugins-bad-free-1.4.2.tar.xz
+c21f0b22bd6c6d493efefe558403d1dd  gst-plugins-bad-free-1.4.5.tar.xz