diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-21 10:14:46 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-21 10:14:46 -0500 |
| commit | b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4 (patch) | |
| tree | 77ca2dcc2cdd9452f5d543b7a04b72898ae8a980 /vp8/encoder/onyx_if.c | |
| parent | 46d9ff1b97ce32ccf6908648203532c4d5de050d (diff) | |
| parent | 8064583d2621a159b01508c1fd0017c4e7887938 (diff) | |
| download | libvpx-b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4.tar libvpx-b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4.tar.gz libvpx-b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4.tar.bz2 libvpx-b6aee6ffab4f0b3e9eac2f14329998d6ac2a19d4.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
configure
Change-Id: I0bc38a6558d0d7f62cd2c551e75c3a59e39008bd
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 420a9e14a..74e173ab6 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3928,7 +3928,7 @@ static void encode_frame_to_data_rate // One pass more conservative else cpi->active_best_quality = kf_high_motion_minq[Q]; - } + } else if (cm->refresh_golden_frame || cpi->common.refresh_alt_ref_frame) { @@ -4273,7 +4273,7 @@ static void encode_frame_to_data_rate IF_RTCD(&cpi->rtcd.variance)); // The key frame is not good enough - if ( kf_err > ((cpi->ambient_err * 3) >> 2) ) + if ( kf_err > ((cpi->ambient_err * 7) >> 3) ) { // Lower q_high q_high = (Q > q_low) ? (Q - 1) : q_low; |