summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2014-02-20 10:46:44 -0800
committerMarco Paniconi <marpan@google.com>2014-02-20 11:45:15 -0800
commit8f69ce2a47ff87a4eddbfc40b59a256d334b8478 (patch)
tree6a9444204186dc1e74e54f1bb06215173d9e2df1
parentfd402e1374531ebdb4ddc59a16dd76c7ee07215e (diff)
downloadlibvpx-8f69ce2a47ff87a4eddbfc40b59a256d334b8478.tar
libvpx-8f69ce2a47ff87a4eddbfc40b59a256d334b8478.tar.gz
libvpx-8f69ce2a47ff87a4eddbfc40b59a256d334b8478.tar.bz2
libvpx-8f69ce2a47ff87a4eddbfc40b59a256d334b8478.zip
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
-rw-r--r--examples/vpx_temporal_scalable_patterns.c7
1 files changed, 4 insertions, 3 deletions
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]);