Skip to content

GitLab

A
aom-rav1e
Commit 0c634c70 authored by Zoe Liu's avatar Zoe Liu
Browse files
Options

Unify the checking on compound mode prediction 

Change-Id: Id9c025febf21aeb67cbc719f585661b715bdb9ce
parent db252a43
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
av1/decoder/decodemv.c
View file @ 0c634c70
......@@ -2498,8 +2498,7 @@ static void read_inter_block_mode_info(AV1Decoder *const pbi,
mbmi->interinter_compound_type = COMPOUND_AVERAGE;
if (
#if CONFIG_COMPOUND_SINGLEREF
(is_inter_compound_mode(mbmi->mode) ||
is_inter_singleref_comp_mode(mbmi->mode))
is_inter_anyref_comp_mode(mbmi->mode)
#else // !CONFIG_COMPOUND_SINGLEREF
cm->reference_mode != SINGLE_REFERENCE &&
is_inter_compound_mode(mbmi->mode)
......
av1/encoder/bitstream.c
View file @ 0c634c70
......@@ -2201,8 +2201,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const int mi_row,
#if CONFIG_EXT_INTER
if (
#if CONFIG_COMPOUND_SINGLEREF
(is_inter_compound_mode(mbmi->mode) ||
is_inter_singleref_comp_mode(mbmi->mode)) &&
is_inter_anyref_comp_mode(mbmi->mode) &&
#else // !CONFIG_COMPOUND_SINGLEREF
cpi->common.reference_mode != SINGLE_REFERENCE &&
is_inter_compound_mode(mbmi->mode) &&
......
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