diff options
author | Jingning Han <jingning@google.com> | 2018-09-20 10:03:27 -0700 |
---|---|---|
committer | Jingning Han <jingning@google.com> | 2018-09-20 10:05:42 -0700 |
commit | bc40b13f33de2e3cf8942659c35a84d8d65b8401 (patch) | |
tree | 2dad3417c74641cd0fdc6f69d5b4889209c6b16d /vp9/encoder/vp9_encodeframe.c | |
parent | 7cc12cbe0e8989a770d1411062154d4f410e8af4 (diff) | |
download | libvpx-bc40b13f33de2e3cf8942659c35a84d8d65b8401.tar libvpx-bc40b13f33de2e3cf8942659c35a84d8d65b8401.tar.gz libvpx-bc40b13f33de2e3cf8942659c35a84d8d65b8401.tar.bz2 libvpx-bc40b13f33de2e3cf8942659c35a84d8d65b8401.zip |
Generalize encoder comp_var_ref setting
Generalize the encoder comp_fixed_ref and comp_var_ref assignments.
Make it fully support 2 fwd + 1 bwd and 1 fwd + 2 bwd settings
that VP9 decoder allows.
Change-Id: Id74da9a66327189a3fdf382d447243003c431131
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
-rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 702f8c2ea..4c131bb60 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -5487,9 +5487,7 @@ void vp9_encode_frame(VP9_COMP *cpi) { cpi->allow_comp_inter_inter = 0; } else { cpi->allow_comp_inter_inter = 1; - cm->comp_fixed_ref = ALTREF_FRAME; - cm->comp_var_ref[0] = LAST_FRAME; - cm->comp_var_ref[1] = GOLDEN_FRAME; + vp9_setup_compound_reference_mode(cm); } } |