From fbfe0bc0e5c2d2d1f22ec176c98f3897334bc369 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Feb 28 2012 17:38:37 +0000 Subject: Update to 0.10.31 --- diff --git a/.gitignore b/.gitignore index 9b2ecef..48fe863 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gst-plugins-good-0.10.29.tar.bz2 /gst-plugins-good-0.10.30.tar.xz +/gst-plugins-good-0.10.31.tar.xz diff --git a/gstreamer-plugins-good-0.10.30-flacdec_also_try_upstream.patch b/gstreamer-plugins-good-0.10.30-flacdec_also_try_upstream.patch deleted file mode 100644 index bcd7c0b..0000000 --- a/gstreamer-plugins-good-0.10.30-flacdec_also_try_upstream.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 900b2fb63dac15fe1013d9e326a7a5c8d4da1cca Mon Sep 17 00:00:00 2001 -From: Tim-Philipp Müller -Date: Mon, 23 May 2011 12:25:44 +0000 -Subject: flacdec: also try upstream first for duration query in DEFAULT format - -https://bugzilla.gnome.org/show_bug.cgi?id=650785 ---- -diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c -index 4957129..2e4085d 100644 ---- a/ext/flac/gstflacdec.c -+++ b/ext/flac/gstflacdec.c -@@ -1724,8 +1724,9 @@ gst_flac_dec_src_query (GstPad * pad, GstQuery * query) - - gst_query_parse_duration (query, &fmt, NULL); - -- /* try any demuxers before us first */ -- if (fmt == GST_FORMAT_TIME && peer && gst_pad_query (peer, query)) { -+ /* try any demuxers or parsers before us first */ -+ if ((fmt == GST_FORMAT_TIME || fmt == GST_FORMAT_DEFAULT) && -+ peer != NULL && gst_pad_query (peer, query)) { - gst_query_parse_duration (query, NULL, &len); - GST_DEBUG_OBJECT (flacdec, "peer returned duration %" GST_TIME_FORMAT, - GST_TIME_ARGS (len)); --- -cgit v0.9.0.2-2-gbebe - diff --git a/gstreamer-plugins-good-0.10.30-flacdec_correct_sample_number_rounding.patch b/gstreamer-plugins-good-0.10.30-flacdec_correct_sample_number_rounding.patch deleted file mode 100644 index dac7147..0000000 --- a/gstreamer-plugins-good-0.10.30-flacdec_correct_sample_number_rounding.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 799c8e3d04456ce0b22c03de66d20d0a1a599643 Mon Sep 17 00:00:00 2001 -From: Monty Montgomery -Date: Thu, 21 Jul 2011 21:23:28 +0000 -Subject: flacdec: Correct sample number rounding resulting in timestamp jitter - -flacdec converts the src timestamp to a sample number, uses that internally, then reconverts the sample number to a timestamp for the output buffer. Unfortunately, sample numbers can't be represented in an integer number of nanoseconds, and the conversion process was truncating rather than rounding, resulting in sample numbers and output timestamps that were often off by a full sample. - -This corrects the time->sample convesion ---- -diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c -index 061fa81..1e2ef5e 100644 ---- a/ext/flac/gstflacdec.c -+++ b/ext/flac/gstflacdec.c -@@ -1668,7 +1668,7 @@ gst_flac_dec_convert_src (GstPad * pad, GstFormat src_format, gint64 src_value, - case GST_FORMAT_BYTES: - scale = bytes_per_sample; - case GST_FORMAT_DEFAULT: -- *dest_value = gst_util_uint64_scale_int (src_value, -+ *dest_value = gst_util_uint64_scale_int_round (src_value, - scale * flacdec->sample_rate, GST_SECOND); - break; - default: --- -cgit v0.9.0.2-2-gbebe diff --git a/gstreamer-plugins-good-0.10.30-flacparse_conversions.patch b/gstreamer-plugins-good-0.10.30-flacparse_conversions.patch deleted file mode 100644 index afc2b75..0000000 --- a/gstreamer-plugins-good-0.10.30-flacparse_conversions.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8823ae251a72bd18fc93322914c70390fc16c6b3 Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge -Date: Mon, 23 May 2011 09:36:36 +0000 -Subject: flacparse: Implement conversions between TIME and DEFAULT format - -Fixes bug #650785. ---- -(limited to 'gst/audioparsers/gstflacparse.c') - -diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c -index 0671187..0c76655 100644 ---- a/gst/audioparsers/gstflacparse.c -+++ b/gst/audioparsers/gstflacparse.c -@@ -198,6 +198,9 @@ static GstFlowReturn gst_flac_parse_parse_frame (GstBaseParse * parse, - GstBaseParseFrame * frame); - static GstFlowReturn gst_flac_parse_pre_push_frame (GstBaseParse * parse, - GstBaseParseFrame * frame); -+static gboolean gst_flac_parse_convert (GstBaseParse * parse, -+ GstFormat src_format, gint64 src_value, GstFormat dest_format, -+ gint64 * dest_value); - - GST_BOILERPLATE (GstFlacParse, gst_flac_parse, GstBaseParse, - GST_TYPE_BASE_PARSE); -@@ -244,6 +247,7 @@ gst_flac_parse_class_init (GstFlacParseClass * klass) - baseparse_class->parse_frame = GST_DEBUG_FUNCPTR (gst_flac_parse_parse_frame); - baseparse_class->pre_push_frame = - GST_DEBUG_FUNCPTR (gst_flac_parse_pre_push_frame); -+ baseparse_class->convert = GST_DEBUG_FUNCPTR (gst_flac_parse_convert); - } - - static void -@@ -1351,3 +1355,34 @@ gst_flac_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) - - return GST_FLOW_OK; - } -+ -+static gboolean -+gst_flac_parse_convert (GstBaseParse * parse, -+ GstFormat src_format, gint64 src_value, GstFormat dest_format, -+ gint64 * dest_value) -+{ -+ GstFlacParse *flacparse = GST_FLAC_PARSE (parse); -+ -+ if (flacparse->samplerate > 0) { -+ if (src_format == GST_FORMAT_DEFAULT && dest_format == GST_FORMAT_TIME) { -+ if (src_value != -1) -+ *dest_value = -+ gst_util_uint64_scale (src_value, GST_SECOND, -+ flacparse->samplerate); -+ else -+ *dest_value = -1; -+ return TRUE; -+ } else if (src_format == GST_FORMAT_TIME && dest_format == GST_FORMAT_TIME) { -+ if (src_value != -1) -+ *dest_value = -+ gst_util_uint64_scale (src_value, flacparse->samplerate, -+ GST_SECOND); -+ else -+ *dest_value = -1; -+ return TRUE; -+ } -+ } -+ -+ return GST_BASE_PARSE_CLASS (parent_class)->convert (parse, src_format, -+ src_value, dest_format, dest_value); -+} --- -cgit v0.9.0.2-2-gbebe - diff --git a/gstreamer-plugins-good-0.10.30-flacparse_fix_conversions.patch b/gstreamer-plugins-good-0.10.30-flacparse_fix_conversions.patch deleted file mode 100644 index 2676465..0000000 --- a/gstreamer-plugins-good-0.10.30-flacparse_fix_conversions.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1183d0c1ab9b567e085e30006b984a578f4a6a88 Mon Sep 17 00:00:00 2001 -From: Tim-Philipp Müller -Date: Mon, 23 May 2011 12:23:21 +0000 -Subject: flacparse: make conversion from TIME to DEFAULT format (samples) work - -Fix copy'n'paste error in the previous commit. ---- -(limited to 'gst/audioparsers/gstflacparse.c') - -diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c -index 0c76655..0995d79 100644 ---- a/gst/audioparsers/gstflacparse.c -+++ b/gst/audioparsers/gstflacparse.c -@@ -1372,7 +1372,8 @@ gst_flac_parse_convert (GstBaseParse * parse, - else - *dest_value = -1; - return TRUE; -- } else if (src_format == GST_FORMAT_TIME && dest_format == GST_FORMAT_TIME) { -+ } else if (src_format == GST_FORMAT_TIME && -+ dest_format == GST_FORMAT_DEFAULT) { - if (src_value != -1) - *dest_value = - gst_util_uint64_scale (src_value, flacparse->samplerate, --- -cgit v0.9.0.2-2-gbebe - diff --git a/gstreamer-plugins-good-0.10.30-flacparse_tell_baseparse.patch b/gstreamer-plugins-good-0.10.30-flacparse_tell_baseparse.patch deleted file mode 100644 index 7c11f77..0000000 --- a/gstreamer-plugins-good-0.10.30-flacparse_tell_baseparse.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a53540346a18d27b94f5254ac2582cb844e9bde0 Mon Sep 17 00:00:00 2001 -From: Tim-Philipp Müller -Date: Mon, 23 May 2011 12:50:46 +0000 -Subject: flacparse: tell baseparse the duration in samples for better accuracy - -Tell GstBaseParse the duration in samples instead of time, so that -a duration query in DEFAULT format will return the correct number -of samples without rounding errors. Baseparse will convert this -into time itself when needed. - -https://bugzilla.gnome.org/show_bug.cgi?id=650785 ---- -diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c -index 0995d79..0c6c529 100644 ---- a/gst/audioparsers/gstflacparse.c -+++ b/gst/audioparsers/gstflacparse.c -@@ -798,10 +798,10 @@ gst_flac_parse_handle_streaminfo (GstFlacParse * flacparse, GstBuffer * buffer) - - if (!gst_bit_reader_get_bits_uint64 (&reader, &flacparse->total_samples, 36)) - goto error; -- if (flacparse->total_samples) -- gst_base_parse_set_duration (GST_BASE_PARSE (flacparse), GST_FORMAT_TIME, -- GST_FRAMES_TO_CLOCK_TIME (flacparse->total_samples, -- flacparse->samplerate), 0); -+ if (flacparse->total_samples) { -+ gst_base_parse_set_duration (GST_BASE_PARSE (flacparse), -+ GST_FORMAT_DEFAULT, flacparse->total_samples, 0); -+ } - - GST_DEBUG_OBJECT (flacparse, "STREAMINFO:\n" - "\tmin/max blocksize: %u/%u,\n" --- -cgit v0.9.0.2-2-gbebe - diff --git a/gstreamer-plugins-good-0.10.30-off_by_one.patch b/gstreamer-plugins-good-0.10.30-off_by_one.patch deleted file mode 100644 index 4880df4..0000000 --- a/gstreamer-plugins-good-0.10.30-off_by_one.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6ac7ad8a2ce59bebcb5b5085fa48c354afff539f Mon Sep 17 00:00:00 2001 -From: Vincent Penquerc'h -Date: Tue, 16 Aug 2011 12:16:22 +0000 -Subject: flacparse: fix off by one in frame size check - -Yes, I was tracking another bug and the small test file I generated -to test with improbably just happened to trigger this, with a second -and last frame of 1615 bytes. - -https://bugzilla.gnome.org/show_bug.cgi?id=656649 ---- -(limited to 'gst/audioparsers/gstflacparse.c') - -diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c -index 0c6c529..3011bf0 100644 ---- a/gst/audioparsers/gstflacparse.c -+++ b/gst/audioparsers/gstflacparse.c -@@ -581,7 +581,7 @@ gst_flac_parse_frame_is_valid (GstFlacParse * flacparse, - data = GST_BUFFER_DATA (buffer); - size = GST_BUFFER_SIZE (buffer); - -- if (size <= flacparse->min_framesize) -+ if (size < flacparse->min_framesize) - goto need_more; - - header_ret = --- -cgit v0.9.0.2-2-gbebe - diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec index 2072ebf..e8915fa 100644 --- a/gstreamer-plugins-good.spec +++ b/gstreamer-plugins-good.spec @@ -1,28 +1,19 @@ %define gstreamer gstreamer %define majorminor 0.10 -%define _gst 0.10.33 +%define _gst 0.10.36 %define _gstpb %{_gst} Name: %{gstreamer}-plugins-good -Version: 0.10.30 -Release: 7%{?dist} +Version: 0.10.31 +Release: 1%{?dist} Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia License: LGPLv2+ URL: http://gstreamer.freedesktop.org/ -#Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/pre/gst-plugins-good-%{version}.tar.bz2 +#Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/pre/gst-plugins-good-%{version}.tar.xz Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz -# Upstream patches to fix https://bugzilla.gnome.org/show_bug.cgi?id=650785 -Patch0: gstreamer-plugins-good-0.10.30-flacparse_tell_baseparse.patch -Patch1: gstreamer-plugins-good-0.10.30-flacdec_also_try_upstream.patch -Patch2: gstreamer-plugins-good-0.10.30-flacparse_conversions.patch -Patch3: gstreamer-plugins-good-0.10.30-flacparse_fix_conversions.patch -Patch4: gstreamer-plugins-good-0.10.30-off_by_one.patch -# Upstream patch to fix flacdec sample number rounding -# https://bugzilla.gnome.org/show_bug.cgi?id=651615 -Patch5: gstreamer-plugins-good-0.10.30-flacdec_correct_sample_number_rounding.patch Requires: %{gstreamer} >= %{_gst} Requires(pre): GConf2 @@ -111,12 +102,6 @@ This package contains documentation for the provided plugins. %prep %setup -q -n gst-plugins-good-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build @@ -255,6 +240,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || : %changelog +* Tue Feb 28 2012 Benjamin Otte 0.10.31-1 +- Update to 0.10.31 + * Fri Jan 13 2012 Fedora Release Engineering - 0.10.30-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 78c3ad9..ce50b25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb9c03d950fe2f9d9392d1b47457440c gst-plugins-good-0.10.30.tar.xz +555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz