diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2017-11-17 10:34:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-17 10:34:26 +0000 |
| commit | 4bd2a59e9bd667460830b5500f47cbc5d0472758 (patch) | |
| tree | 3924e388bf245b47aa9155fd759ad0df4f079855 | |
| parent | ea14a1a965c51a4220427d9e8b34eec92d58a997 (diff) | |
| parent | 607e45f42027cde9cab7a017559ea02fd397fffd (diff) | |
| download | libvpx-4bd2a59e9bd667460830b5500f47cbc5d0472758.tar libvpx-4bd2a59e9bd667460830b5500f47cbc5d0472758.tar.gz libvpx-4bd2a59e9bd667460830b5500f47cbc5d0472758.tar.bz2 libvpx-4bd2a59e9bd667460830b5500f47cbc5d0472758.zip | |
Merge "Add clause to alt ref group breakout."
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index caa58e7a8..277d15c77 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2091,8 +2091,8 @@ static int calc_arf_boost(VP9_COMP *cpi, int f_frames, int b_frames) { } arf_boost += (int)boost_score; - if (arf_boost < ((b_frames + f_frames) * 20)) - arf_boost = ((b_frames + f_frames) * 20); + if (arf_boost < ((b_frames + f_frames) * 40)) + arf_boost = ((b_frames + f_frames) * 40); arf_boost = VPXMAX(arf_boost, MIN_ARF_GF_BOOST); return arf_boost; @@ -2562,7 +2562,6 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { } // Calculate a boost number for this frame. - sr_accumulator = 0.0; boost_score += decay_accumulator * calc_frame_boost(cpi, &next_frame, &sr_accumulator, this_frame_mv_in_out, GF_MAX_BOOST); @@ -2580,7 +2579,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { ((mv_ratio_accumulator > mv_ratio_accumulator_thresh) || (abs_mv_in_out_accumulator > abs_mv_in_out_thresh) || (mv_in_out_accumulator < -mv_in_out_thresh) || - (decay_accumulator < ARF_DECAY_BREAKOUT)))) { + (decay_accumulator < ARF_DECAY_BREAKOUT) || + (sr_accumulator > next_frame.intra_error)))) { boost_score = old_boost_score; break; } |