diff options
| author | Yunqing Wang <yunqingwang@google.com> | 2019-07-15 18:31:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-15 18:31:09 +0000 |
| commit | bb407a27b2e32f89f0e9eeee2bcd0aa9d5cfea3f (patch) | |
| tree | edcee9e9e850640ecb967c1b3e1677b00ca9da8f /vp9/encoder/vp9_encoder.c | |
| parent | 468e77b9ea78a5a7d60fb86d016b833982860d9c (diff) | |
| parent | ed5a5a06bd5cc9524642e43c5307eb2c69aef00e (diff) | |
| download | libvpx-bb407a27b2e32f89f0e9eeee2bcd0aa9d5cfea3f.tar libvpx-bb407a27b2e32f89f0e9eeee2bcd0aa9d5cfea3f.tar.gz libvpx-bb407a27b2e32f89f0e9eeee2bcd0aa9d5cfea3f.tar.bz2 libvpx-bb407a27b2e32f89f0e9eeee2bcd0aa9d5cfea3f.zip | |
Merge "Revert "Set up frame contexts based on frame type""
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 34d3d8725..ec7baf0a7 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -814,17 +814,7 @@ static void setup_frame(VP9_COMP *cpi) { if (frame_is_intra_only(cm) || cm->error_resilient_mode) { vp9_setup_past_independence(cm); } else { - if (!cpi->use_svc) { - const int boost_frame = - !cpi->rc.is_src_frame_alt_ref && - (cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame); - if (boost_frame) - cm->frame_context_idx = 1; - else if (cpi->rc.is_src_frame_alt_ref) - cm->frame_context_idx = 2; - else - cm->frame_context_idx = 3; - } + if (!cpi->use_svc) cm->frame_context_idx = cpi->refresh_alt_ref_frame; } // TODO(jingning): Overwrite the frame_context_idx index in multi-layer ARF |