diff options
author | Jerome Jiang <jianj@google.com> | 2022-01-11 08:46:59 -0800 |
---|---|---|
committer | Jerome Jiang <jianj@google.com> | 2022-01-11 08:47:34 -0800 |
commit | 6982214de5cc62f1f4dc733f1bcc3ffbd74780b0 (patch) | |
tree | 14ebaba6e5d289bd0e9ce119b123a96aef8abed4 /vp9/encoder/vp9_encoder.c | |
parent | 44e611482e13fdffa0acde780a20dd68ee153498 (diff) | |
download | libvpx-6982214de5cc62f1f4dc733f1bcc3ffbd74780b0.tar libvpx-6982214de5cc62f1f4dc733f1bcc3ffbd74780b0.tar.gz libvpx-6982214de5cc62f1f4dc733f1bcc3ffbd74780b0.tar.bz2 libvpx-6982214de5cc62f1f4dc733f1bcc3ffbd74780b0.zip |
Revert "Add vp9 ref frame to flag map function"
This reverts commit 44e611482e13fdffa0acde780a20dd68ee153498.
Change-Id: Ic900cc01be4de7983fab42178a488277efab77b3
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
-rw-r--r-- | vp9/encoder/vp9_encoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 1038bd951..8d5ec5a36 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -586,6 +586,8 @@ static void apply_roi_map(VP9_COMP *cpi) { int ref_frame[8]; int internal_delta_q[MAX_SEGMENTS]; int i; + static const int flag_list[4] = { 0, VP9_LAST_FLAG, VP9_GOLD_FLAG, + VP9_ALT_FLAG }; // TODO(jianj): Investigate why ROI not working in speed < 5 or in non // realtime mode. @@ -626,7 +628,7 @@ static void apply_roi_map(VP9_COMP *cpi) { valid_ref = 0; // If GOLDEN is selected, make sure it's set as reference. if (ref_frame[i] == GOLDEN_FRAME && - !(cpi->ref_frame_flags & ref_frame_to_flag(ref_frame[i]))) { + !(cpi->ref_frame_flags & flag_list[ref_frame[i]])) { valid_ref = 0; } // GOLDEN was updated in previous encoded frame, so GOLDEN and LAST are |