Commit 5fc3099c authored by Fei Wang's avatar Fei Wang Committed by James Almer

avcodec/cbs_av1: rename enable_intraintra_compound flag

rename enable_intraintra_compound to enable_interintra_compound,
which keep same as AV1 sepc(v1.0.0-errata1).
Signed-off-by: 's avatarFei Wang <fei.w.wang@intel.com>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 86e9747c
...@@ -105,7 +105,7 @@ typedef struct AV1RawSequenceHeader { ...@@ -105,7 +105,7 @@ typedef struct AV1RawSequenceHeader {
uint8_t use_128x128_superblock; uint8_t use_128x128_superblock;
uint8_t enable_filter_intra; uint8_t enable_filter_intra;
uint8_t enable_intra_edge_filter; uint8_t enable_intra_edge_filter;
uint8_t enable_intraintra_compound; uint8_t enable_interintra_compound;
uint8_t enable_masked_compound; uint8_t enable_masked_compound;
uint8_t enable_warped_motion; uint8_t enable_warped_motion;
uint8_t enable_dual_filter; uint8_t enable_dual_filter;
......
...@@ -268,7 +268,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, ...@@ -268,7 +268,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
flag(enable_intra_edge_filter); flag(enable_intra_edge_filter);
if (current->reduced_still_picture_header) { if (current->reduced_still_picture_header) {
infer(enable_intraintra_compound, 0); infer(enable_interintra_compound, 0);
infer(enable_masked_compound, 0); infer(enable_masked_compound, 0);
infer(enable_warped_motion, 0); infer(enable_warped_motion, 0);
infer(enable_dual_filter, 0); infer(enable_dual_filter, 0);
...@@ -281,7 +281,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, ...@@ -281,7 +281,7 @@ static int FUNC(sequence_header_obu)(CodedBitstreamContext *ctx, RWContext *rw,
infer(seq_force_integer_mv, infer(seq_force_integer_mv,
AV1_SELECT_INTEGER_MV); AV1_SELECT_INTEGER_MV);
} else { } else {
flag(enable_intraintra_compound); flag(enable_interintra_compound);
flag(enable_masked_compound); flag(enable_masked_compound);
flag(enable_warped_motion); flag(enable_warped_motion);
flag(enable_dual_filter); flag(enable_dual_filter);
......
...@@ -257,7 +257,7 @@ static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_ ...@@ -257,7 +257,7 @@ static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_
if (!reduced_still_picture_header) { if (!reduced_still_picture_header) {
int enable_order_hint, seq_force_screen_content_tools; int enable_order_hint, seq_force_screen_content_tools;
skip_bits(&gb, 4); // enable_intraintra_compound (1), enable_masked_compound (1) skip_bits(&gb, 4); // enable_interintra_compound (1), enable_masked_compound (1)
// enable_warped_motion (1), enable_dual_filter (1) // enable_warped_motion (1), enable_dual_filter (1)
enable_order_hint = get_bits1(&gb); enable_order_hint = get_bits1(&gb);
......
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