From: Marco Paniconi <marpan@google.com>
Date: Thu, 20 Feb 2014 18:46:44 +0000 (-0800)
Subject: vpx_temporal_scalable_patterns: set rc_target_bitrate correct.
X-Git-Tag: v1.4.0~2311^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f69ce2a47ff87a4eddbfc40b59a256d334b8478;p=libvpx

vpx_temporal_scalable_patterns: set rc_target_bitrate correct.

Current setting was specific to 1 layer case.
rc_target_bitrate is total bitrate for whole stream,
so set it to ts_target_bitrate for highest/top temporal layer.

Change-Id: I83de73364956fa21c0a7c971c9f390d4840457e6
---

diff --git a/examples/vpx_temporal_scalable_patterns.c b/examples/vpx_temporal_scalable_patterns.c
index e42c7e0a0..32e88e33f 100644
--- a/examples/vpx_temporal_scalable_patterns.c
+++ b/examples/vpx_temporal_scalable_patterns.c
@@ -516,9 +516,6 @@ int main(int argc, char **argv) {
   // Disable automatic keyframe placement.
   cfg.kf_min_dist = cfg.kf_max_dist = 3000;
 
-  // Default setting for bitrate: used in special case of 1 layer (case 0).
-  cfg.rc_target_bitrate = cfg.ts_target_bitrate[0];
-
   set_temporal_layer_pattern(layering_mode,
                              &cfg,
                              layer_flags,
@@ -526,6 +523,10 @@ int main(int argc, char **argv) {
 
   set_rate_control_metrics(&rc, &cfg);
 
+  // Target bandwidth for the whole stream.
+  // Set to ts_target_bitrate for highest layer (total bitrate).
+  cfg.rc_target_bitrate = cfg.ts_target_bitrate[cfg.ts_number_layers - 1];
+
   // Open input file.
   if (!(infile = fopen(argv[1], "rb"))) {
     die("Failed to open %s for reading", argv[1]);