Commit f4754474 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "Remove the resetting of qp params for temporal layers."

parents aa4f9dd1 ef4a9670
......@@ -1378,10 +1378,6 @@ static void update_layer_contexts (VP8_COMP *cpi)
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;
}
}
......
......@@ -388,13 +388,13 @@ static void calc_iframe_target_size(VP8_COMP *cpi)
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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment