diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-10 14:56:41 -0800 |
|---|---|---|
| committer | Alex Converse <aconverse@google.com> | 2014-02-13 13:38:59 -0800 |
| commit | edec8087871c76049f2ae1a627beb317de9b700d (patch) | |
| tree | 21784ddc707bfa814ae98e8831f3257dadefa9b3 | |
| parent | 56f27522313dd5bf8d80af2b4b08e647e14425f7 (diff) | |
| download | libvpx-edec8087871c76049f2ae1a627beb317de9b700d.tar libvpx-edec8087871c76049f2ae1a627beb317de9b700d.tar.gz libvpx-edec8087871c76049f2ae1a627beb317de9b700d.tar.bz2 libvpx-edec8087871c76049f2ae1a627beb317de9b700d.zip | |
Disable using golden frame modes if golden frames are not being used
Change-Id: I662c480ad49a242e10f1edb0c339ddbe2c6bccf4
| -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; |