[Pkg-gstreamer-commits] [SCM] GStreamer Bad Plugins 0.10 Packaging branch, master, updated. debian/0.10.23-2-1-gff12592

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit ff12592aedda62b9c2f6749e5f0125a55933c528
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Tue May 22 11:39:04 2012 +0200

    debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch: Patch from upstream GIT to fix encoding with libvpx 1.1.0

diff --git a/debian/changelog b/debian/changelog
index a43d3aa..5758d97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gst-plugins-bad0.10 (0.10.23-3) unstable; urgency=medium
+
+  * debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch:
+    + Patch from upstream GIT to fix encoding with libvpx 1.1.0.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 22 May 2012 11:38:32 +0200
+
 gst-plugins-bad0.10 (0.10.23-2) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch b/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
new file mode 100644
index 0000000..3782699
--- /dev/null
+++ b/debian/patches/0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
@@ -0,0 +1,45 @@
+From 04909e2c50e6802ea5dec6d0085d60d5c57f671c Mon Sep 17 00:00:00 2001
+From: Vincent Penquerc'h <vincent.penquerch at collabora.co.uk>
+Date: Fri, 18 May 2012 12:46:55 +0100
+Subject: [PATCH] vp8enc: fix target bitrate config with libvpx 1.1.0
+
+libvpx 1.1.0 disallows a bitrate of 0, which was used by
+vp8enc as a default value.
+
+Instead, we use the default libvpx bitrate, scaled to our
+video size, if no bitrate was specified.
+
+This fixes encoding VP8 video with libvpx 1.1.0.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676245
+---
+ ext/vp8/gstvp8enc.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
+index 9b0c4fe..6316021 100644
+--- a/ext/vp8/gstvp8enc.c
++++ b/ext/vp8/gstvp8enc.c
+@@ -734,6 +734,11 @@ gst_vp8_enc_set_format (GstVideoEncoder * video_encoder,
+     return FALSE;
+   }
+ 
++  /* Scale default bitrate to our size */
++  cfg.rc_target_bitrate = gst_util_uint64_scale (cfg.rc_target_bitrate,
++      GST_VIDEO_INFO_WIDTH (info) * GST_VIDEO_INFO_HEIGHT (info),
++      cfg.g_w * cfg.g_h);
++
+   cfg.g_w = GST_VIDEO_INFO_WIDTH (info);
+   cfg.g_h = GST_VIDEO_INFO_HEIGHT (info);
+   cfg.g_timebase.num = GST_VIDEO_INFO_FPS_D (info);
+@@ -757,7 +762,6 @@ gst_vp8_enc_set_format (GstVideoEncoder * video_encoder,
+   } else {
+     cfg.rc_min_quantizer = (gint) (63 - encoder->quality * 6.2);
+     cfg.rc_max_quantizer = (gint) (63 - encoder->quality * 6.2);
+-    cfg.rc_target_bitrate = encoder->bitrate;
+   }
+   cfg.rc_dropframe_thresh = encoder->drop_frame;
+   cfg.rc_resize_allowed = encoder->resize_allowed;
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb..c209868 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001-vp8enc-fix-target-bitrate-config-with-libvpx-1.1.0.patch
 99_ltmain_as-needed.patch

-- 
GStreamer Bad Plugins 0.10 Packaging