diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-13 16:39:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 16:39:32 -0800 |
| commit | 27f809db914dfb2e4bc108134a8ccd46a0ce8bd0 (patch) | |
| tree | b96baa24425eeba2fdba897589630c38625b1dd4 /vp9 | |
| parent | 49b4b72b7a0999a9b6b8dab6504fe52e717c2fb0 (diff) | |
| parent | edec8087871c76049f2ae1a627beb317de9b700d (diff) | |
| download | libvpx-27f809db914dfb2e4bc108134a8ccd46a0ce8bd0.tar libvpx-27f809db914dfb2e4bc108134a8ccd46a0ce8bd0.tar.gz libvpx-27f809db914dfb2e4bc108134a8ccd46a0ce8bd0.tar.bz2 libvpx-27f809db914dfb2e4bc108134a8ccd46a0ce8bd0.zip | |
Merge "Disable using golden frame modes if golden frames are not being used"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index cef7e0403..d45177ec2 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -495,6 +495,18 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) { sf->thresh_mult[THR_D207_PRED] += 2500; sf->thresh_mult[THR_D63_PRED] += 2500; + // disable using golden frame modes if golden frames are not being used + if (cpi->rc.frames_till_gf_update_due == INT_MAX) { + sf->thresh_mult[THR_NEARESTG ] = INT_MAX; + sf->thresh_mult[THR_ZEROG ] = INT_MAX; + sf->thresh_mult[THR_NEARG ] = INT_MAX; + sf->thresh_mult[THR_NEWG ] = INT_MAX; + sf->thresh_mult[THR_COMP_ZEROGA ] = INT_MAX; + sf->thresh_mult[THR_COMP_NEARESTGA] = INT_MAX; + sf->thresh_mult[THR_COMP_NEARGA ] = INT_MAX; + sf->thresh_mult[THR_COMP_NEWGA ] = INT_MAX; + } + /* disable frame modes if flags not set */ if (!(cpi->ref_frame_flags & VP9_LAST_FLAG)) { sf->thresh_mult[THR_NEWMV ] = INT_MAX; |