ref: f47544745e7e7de7d6a07ad5a66361b33d548150
parent: aa4f9dd153a07b3f3aaff102e37b008bfd1678c9
parent: ef4a9670a85450a4ea4587634c20ca6c2fa2f8f9
author: Jim Bankoski <jimbankoski@google.com>
date: Fri Jul 27 17:22:15 EDT 2012
Merge "Remove the resetting of qp params for temporal layers."
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1378,10 +1378,6 @@
oxcf->target_bitrate[i-1]) * 1000 /
(lc->frame_rate - prev_layer_frame_rate);
- lc->active_worst_quality = oxcf->worst_allowed_q;
- lc->active_best_quality = oxcf->best_allowed_q;
- lc->avg_frame_qindex = oxcf->worst_allowed_q;
-
prev_layer_frame_rate = lc->frame_rate;
}
}
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -388,13 +388,13 @@
int Q = (cpi->common.frame_flags & FRAMEFLAGS_KEY)
? cpi->avg_frame_qindex : cpi->ni_av_qi;
- int initial_boost = 24; /* |2.5 * per_frame_bandwidth| */
+ int initial_boost = 32; /* |3.0 * per_frame_bandwidth| */
/* Boost depends somewhat on frame rate: only used for 1 layer case. */
if (cpi->oxcf.number_of_layers == 1) {kf_boost = MAX(initial_boost, (int)(2 * cpi->output_frame_rate - 16));
}
else {- /* Initial factor: set target size to: |2.5 * per_frame_bandwidth|. */
+ /* Initial factor: set target size to: |3.0 * per_frame_bandwidth|. */
kf_boost = initial_boost;
}