ref: 4774d389706716be5fdea445966d96cc3012a836
parent: 46df71396df5a079a7195f9bc85399e83cd57cfd
parent: 517a6620054312d1114a4ba03aaf331eb7833974
author: Marco <[email protected]>
date: Tue Jun 23 19:55:15 EDT 2015
Merge "aq-mode=3: Reduce boost for segment#2 at low bitrates/low res."
--- a/vp9/encoder/vp9_aq_cyclicrefresh.c
+++ b/vp9/encoder/vp9_aq_cyclicrefresh.c
@@ -129,7 +129,8 @@
else if (bsize >= BLOCK_16X16 &&
rate < cr->thresh_rate_sb &&
is_inter_block(mbmi) &&
- mbmi->mv[0].as_int == 0)
+ mbmi->mv[0].as_int == 0 &&
+ cr->rate_boost_fac > 1.0)
// More aggressive delta-q for bigger blocks with zero motion.
return CR_SEGMENT_ID_BOOST2;
else
@@ -464,7 +465,7 @@
cm->height <= 288 &&
rc->avg_frame_bandwidth < 3400) {
cr->motion_thresh = 4;
- cr->rate_boost_fac = 1.25;
+ cr->rate_boost_fac = 1.0;
} else {
cr->motion_thresh = 32;
cr->rate_boost_fac = 1.7;