From 3dd9cde2a5e9661f096e4d42f6012ff52a7c156a Mon Sep 17 00:00:00 2001 From: Marco Date: Wed, 24 Jun 2015 16:12:12 -0700 Subject: [PATCH] Fix to unstable build from commit 517a66. Change-Id: I123db2d20ae65a10e2dec95eec61150e2f69546d --- vp9/encoder/vp9_aq_cyclicrefresh.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vp9/encoder/vp9_aq_cyclicrefresh.c b/vp9/encoder/vp9_aq_cyclicrefresh.c index f5b3f2108..6270bf452 100644 --- a/vp9/encoder/vp9_aq_cyclicrefresh.c +++ b/vp9/encoder/vp9_aq_cyclicrefresh.c @@ -51,7 +51,7 @@ struct CYCLIC_REFRESH { // Rate target ratio to set q delta. double rate_ratio_qdelta; // Boost factor for rate target ratio, for segment CR_SEGMENT_ID_BOOST2. - double rate_boost_fac; + int rate_boost_fac; double low_content_avg; int qindex_delta[3]; }; @@ -130,7 +130,7 @@ static int candidate_refresh_aq(const CYCLIC_REFRESH *cr, rate < cr->thresh_rate_sb && is_inter_block(mbmi) && mbmi->mv[0].as_int == 0 && - cr->rate_boost_fac > 1.0) + cr->rate_boost_fac > 10) // More aggressive delta-q for bigger blocks with zero motion. return CR_SEGMENT_ID_BOOST2; else @@ -465,10 +465,10 @@ void vp9_cyclic_refresh_update_parameters(VP9_COMP *const cpi) { cm->height <= 288 && rc->avg_frame_bandwidth < 3400) { cr->motion_thresh = 4; - cr->rate_boost_fac = 1.0; + cr->rate_boost_fac = 10; } else { cr->motion_thresh = 32; - cr->rate_boost_fac = 1.7; + cr->rate_boost_fac = 17; } } @@ -542,9 +542,9 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) { vp9_set_segdata(seg, CR_SEGMENT_ID_BOOST1, SEG_LVL_ALT_Q, qindex_delta); // Set a more aggressive (higher) q delta for segment BOOST2. - qindex_delta = compute_deltaq(cpi, cm->base_qindex, - MIN(CR_MAX_RATE_TARGET_RATIO, - cr->rate_boost_fac * cr->rate_ratio_qdelta)); + qindex_delta = compute_deltaq( + cpi, cm->base_qindex, MIN(CR_MAX_RATE_TARGET_RATIO, + 0.1 * cr->rate_boost_fac * cr->rate_ratio_qdelta)); cr->qindex_delta[2] = qindex_delta; vp9_set_segdata(seg, CR_SEGMENT_ID_BOOST2, SEG_LVL_ALT_Q, qindex_delta); -- 2.40.0