Commit 104d8ec0 authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review

Merge "Don't let GOLDEN_FRAME turn off LAST_FRAME as a reference when GOLDEN_FRAME is disabled."

parents e4118e25 801f136b
...@@ -490,18 +490,6 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) { ...@@ -490,18 +490,6 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi) {
sf->thresh_mult[THR_D207_PRED] += 2500; sf->thresh_mult[THR_D207_PRED] += 2500;
sf->thresh_mult[THR_D63_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 */ /* disable frame modes if flags not set */
if (!(cpi->ref_frame_flags & VP9_LAST_FLAG)) { if (!(cpi->ref_frame_flags & VP9_LAST_FLAG)) {
sf->thresh_mult[THR_NEWMV ] = INT_MAX; sf->thresh_mult[THR_NEWMV ] = INT_MAX;
...@@ -3074,6 +3062,9 @@ static void get_ref_frame_flags(VP9_COMP *cpi) { ...@@ -3074,6 +3062,9 @@ static void get_ref_frame_flags(VP9_COMP *cpi) {
if (cpi->gold_is_last) if (cpi->gold_is_last)
cpi->ref_frame_flags &= ~VP9_GOLD_FLAG; cpi->ref_frame_flags &= ~VP9_GOLD_FLAG;
if (cpi->rc.frames_till_gf_update_due == INT_MAX)
cpi->ref_frame_flags &= ~VP9_GOLD_FLAG;
if (cpi->alt_is_last) if (cpi->alt_is_last)
cpi->ref_frame_flags &= ~VP9_ALT_FLAG; cpi->ref_frame_flags &= ~VP9_ALT_FLAG;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment