ref: 9012ebc269c789586ca33d9a771df134de4a2c6a
parent: 2c38592ec6198cbfcca538d05d86b0b11974dc85
parent: 4bb51416e183381cd1df474662a8224a47476c2d
author: Deepa K G <deepa.kg@ittiam.com>
date: Tue Apr 30 03:59:01 EDT 2019
Merge "Refine active best quality of layered ARF frames"
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -1446,19 +1446,18 @@
// Constrained quality use slightly lower active best.
active_best_quality = active_best_quality * 15 / 16;
-
- // Modify best quality for second level arfs. For mode VPX_Q this
- // becomes the baseline frame q.
- if (gf_group->rf_level[gf_group_index] == GF_ARF_LOW) {
- const int layer_depth = gf_group->layer_depth[gf_group_index];
- // linearly fit the frame q depending on the layer depth index from
- // the base layer ARF.
- active_best_quality =
- ((layer_depth - 1) * q + active_best_quality + layer_depth / 2) /
- layer_depth;
- }
} else {
active_best_quality = get_gf_active_quality(cpi, q, cm->bit_depth);
+ }
+ // Modify best quality for second level arfs. For mode VPX_Q this
+ // becomes the baseline frame q.
+ if (gf_group->rf_level[gf_group_index] == GF_ARF_LOW) {
+ const int layer_depth = gf_group->layer_depth[gf_group_index];
+ // linearly fit the frame q depending on the layer depth index from
+ // the base layer ARF.
+ active_best_quality =
+ ((layer_depth - 1) * q + active_best_quality + layer_depth / 2) /
+ layer_depth;
}
} else {
active_best_quality = inter_minq[active_worst_quality];