From 01b86b6b2aefe11c334c53308b79e8ff23837166 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Fri, 18 May 2012 12:46:55 +0100 Subject: [PATCH] [MOVED FROM BAD 111/134] 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 32556d153e..81fab93219 100644 --- a/ext/vp8/gstvp8enc.c +++ b/ext/vp8/gstvp8enc.c @@ -728,6 +728,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); @@ -751,7 +756,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;