diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-02-13 09:31:53 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 09:31:53 -0800 |
| commit | d84978b84fc8f3b329e60b77d4180000136b81f2 (patch) | |
| tree | 350392ee0a5b27f73442866d1f2358fff9ea7fe5 /vp9/encoder/vp9_firstpass.c | |
| parent | 32d07c626e09c504f91b1396876a52df376e9c30 (diff) | |
| parent | c30a9cd97dbeee9cdd18527e9571304cb01d0073 (diff) | |
| download | libvpx-d84978b84fc8f3b329e60b77d4180000136b81f2.tar libvpx-d84978b84fc8f3b329e60b77d4180000136b81f2.tar.gz libvpx-d84978b84fc8f3b329e60b77d4180000136b81f2.tar.bz2 libvpx-d84978b84fc8f3b329e60b77d4180000136b81f2.zip | |
Merge changes I121fe66c,I94f57f8a
* changes:
Remove some cases for turning off arf.
Modified Aq1 and Aq2
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 5efb00a27..bf9dd3ec5 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1566,13 +1566,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { (i >= MIN_GF_INTERVAL) && // for real scene cuts (not forced kfs) dont allow arf very near kf. (rc->next_key_frame_forced || - (i <= (rc->frames_to_key - MIN_GF_INTERVAL))) && - ((next_frame.pcnt_inter > 0.75) || - (next_frame.pcnt_second_ref > 0.5)) && - ((mv_in_out_accumulator / (double)i > -0.2) || - (mv_in_out_accumulator > -2.0)) && - (boost_score > 100)) { - + (i <= (rc->frames_to_key - MIN_GF_INTERVAL)))) { // Alternative boost calculation for alt ref rc->gfu_boost = calc_arf_boost(cpi, 0, (i - 1), (i - 1), &f_boost, &b_boost); |