Commit 78bfc285 authored by Arild Fuldseth (arilfuld)'s avatar Arild Fuldseth (arilfuld) Committed by Arild Fuldseth

Rename LOWDELAY_COMPOUND to ONE_SIDED_COMPOUND

Change-Id: I05b2c8c116b5e3287be2703e840a28f6dda9c42a
parent a77ec1c9
...@@ -320,7 +320,7 @@ int av1_get_reference_mode_context(const AV1_COMMON *cm, ...@@ -320,7 +320,7 @@ int av1_get_reference_mode_context(const AV1_COMMON *cm,
// //
// NOTE(zoeliu): The probability of ref_frame[0] is either // NOTE(zoeliu): The probability of ref_frame[0] is either
// GOLDEN_FRAME or LAST3_FRAME. // GOLDEN_FRAME or LAST3_FRAME.
#if CONFIG_LOWDELAY_COMPOUND #if CONFIG_ONE_SIDED_COMPOUND
int av1_get_pred_context_comp_ref_p(UNUSED const AV1_COMMON *cm, int av1_get_pred_context_comp_ref_p(UNUSED const AV1_COMMON *cm,
const MACROBLOCKD *xd) { const MACROBLOCKD *xd) {
#else #else
...@@ -337,7 +337,7 @@ int av1_get_pred_context_comp_ref_p(const AV1_COMMON *cm, ...@@ -337,7 +337,7 @@ int av1_get_pred_context_comp_ref_p(const AV1_COMMON *cm,
// The mode info data structure has a one element border above and to the // The mode info data structure has a one element border above and to the
// left of the entries correpsonding to real macroblocks. // left of the entries correpsonding to real macroblocks.
// The prediction flags in these dummy entries are initialised to 0. // The prediction flags in these dummy entries are initialised to 0.
#if CONFIG_LOWDELAY_COMPOUND // No change to bitstream #if CONFIG_ONE_SIDED_COMPOUND // No change to bitstream
// Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1 // Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1
const int bwd_ref_sign_idx = 1; const int bwd_ref_sign_idx = 1;
#else #else
...@@ -430,7 +430,7 @@ int av1_get_pred_context_comp_ref_p(const AV1_COMMON *cm, ...@@ -430,7 +430,7 @@ int av1_get_pred_context_comp_ref_p(const AV1_COMMON *cm,
// //
// NOTE(zoeliu): The probability of ref_frame[0] is LAST_FRAME, // NOTE(zoeliu): The probability of ref_frame[0] is LAST_FRAME,
// conditioning on it is either LAST_FRAME or LAST2_FRAME. // conditioning on it is either LAST_FRAME or LAST2_FRAME.
#if CONFIG_LOWDELAY_COMPOUND #if CONFIG_ONE_SIDED_COMPOUND
int av1_get_pred_context_comp_ref_p1(UNUSED const AV1_COMMON *cm, int av1_get_pred_context_comp_ref_p1(UNUSED const AV1_COMMON *cm,
const MACROBLOCKD *xd) { const MACROBLOCKD *xd) {
#else #else
...@@ -447,7 +447,7 @@ int av1_get_pred_context_comp_ref_p1(const AV1_COMMON *cm, ...@@ -447,7 +447,7 @@ int av1_get_pred_context_comp_ref_p1(const AV1_COMMON *cm,
// The mode info data structure has a one element border above and to the // The mode info data structure has a one element border above and to the
// left of the entries correpsonding to real macroblocks. // left of the entries correpsonding to real macroblocks.
// The prediction flags in these dummy entries are initialised to 0. // The prediction flags in these dummy entries are initialised to 0.
#if CONFIG_LOWDELAY_COMPOUND // No change to bitstream #if CONFIG_ONE_SIDED_COMPOUND // No change to bitstream
// Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1 // Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1
const int bwd_ref_sign_idx = 1; const int bwd_ref_sign_idx = 1;
#else #else
...@@ -541,7 +541,7 @@ int av1_get_pred_context_comp_ref_p1(const AV1_COMMON *cm, ...@@ -541,7 +541,7 @@ int av1_get_pred_context_comp_ref_p1(const AV1_COMMON *cm,
// //
// NOTE(zoeliu): The probability of ref_frame[0] is GOLDEN_FRAME, // NOTE(zoeliu): The probability of ref_frame[0] is GOLDEN_FRAME,
// conditioning on it is either GOLDEN or LAST3. // conditioning on it is either GOLDEN or LAST3.
#if CONFIG_LOWDELAY_COMPOUND #if CONFIG_ONE_SIDED_COMPOUND
int av1_get_pred_context_comp_ref_p2(UNUSED const AV1_COMMON *cm, int av1_get_pred_context_comp_ref_p2(UNUSED const AV1_COMMON *cm,
const MACROBLOCKD *xd) { const MACROBLOCKD *xd) {
#else #else
...@@ -558,7 +558,7 @@ int av1_get_pred_context_comp_ref_p2(const AV1_COMMON *cm, ...@@ -558,7 +558,7 @@ int av1_get_pred_context_comp_ref_p2(const AV1_COMMON *cm,
// The mode info data structure has a one element border above and to the // The mode info data structure has a one element border above and to the
// left of the entries correpsonding to real macroblocks. // left of the entries correpsonding to real macroblocks.
// The prediction flags in these dummy entries are initialised to 0. // The prediction flags in these dummy entries are initialised to 0.
#if CONFIG_LOWDELAY_COMPOUND // No change to bitstream #if CONFIG_ONE_SIDED_COMPOUND // No change to bitstream
// Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1 // Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1
const int bwd_ref_sign_idx = 1; const int bwd_ref_sign_idx = 1;
#else #else
...@@ -646,7 +646,7 @@ int av1_get_pred_context_comp_ref_p2(const AV1_COMMON *cm, ...@@ -646,7 +646,7 @@ int av1_get_pred_context_comp_ref_p2(const AV1_COMMON *cm,
} }
// Returns a context number for the given MB prediction signal // Returns a context number for the given MB prediction signal
#if CONFIG_LOWDELAY_COMPOUND #if CONFIG_ONE_SIDED_COMPOUND
int av1_get_pred_context_comp_bwdref_p(UNUSED const AV1_COMMON *cm, int av1_get_pred_context_comp_bwdref_p(UNUSED const AV1_COMMON *cm,
const MACROBLOCKD *xd) { const MACROBLOCKD *xd) {
#else #else
...@@ -663,7 +663,7 @@ int av1_get_pred_context_comp_bwdref_p(const AV1_COMMON *cm, ...@@ -663,7 +663,7 @@ int av1_get_pred_context_comp_bwdref_p(const AV1_COMMON *cm,
// The mode info data structure has a one element border above and to the // The mode info data structure has a one element border above and to the
// left of the entries corresponding to real macroblocks. // left of the entries corresponding to real macroblocks.
// The prediction flags in these dummy entries are initialized to 0. // The prediction flags in these dummy entries are initialized to 0.
#if CONFIG_LOWDELAY_COMPOUND // No change to bitstream #if CONFIG_ONE_SIDED_COMPOUND // No change to bitstream
// Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1 // Code seems to assume that signbias of cm->comp_bwd_ref[0] is always 1
const int bwd_ref_sign_idx = 1; const int bwd_ref_sign_idx = 1;
#else #else
......
...@@ -92,7 +92,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi, ...@@ -92,7 +92,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
struct aom_read_bit_buffer *rb); struct aom_read_bit_buffer *rb);
static int is_compound_reference_allowed(const AV1_COMMON *cm) { static int is_compound_reference_allowed(const AV1_COMMON *cm) {
#if CONFIG_LOWDELAY_COMPOUND // Normative in decoder #if CONFIG_ONE_SIDED_COMPOUND // Normative in decoder
return !frame_is_intra_only(cm); return !frame_is_intra_only(cm);
#else #else
int i; int i;
......
...@@ -1224,7 +1224,7 @@ static void read_ref_frames(AV1_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -1224,7 +1224,7 @@ static void read_ref_frames(AV1_COMMON *const cm, MACROBLOCKD *const xd,
const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r); const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r);
// FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding // FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding
if (mode == COMPOUND_REFERENCE) { if (mode == COMPOUND_REFERENCE) {
#if CONFIG_LOWDELAY_COMPOUND // Normative in decoder (for low delay) #if CONFIG_ONE_SIDED_COMPOUND // Normative in decoder (for low delay)
const int idx = 1; const int idx = 1;
#else #else
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
......
...@@ -5438,7 +5438,7 @@ void av1_encode_frame(AV1_COMP *cpi) { ...@@ -5438,7 +5438,7 @@ void av1_encode_frame(AV1_COMP *cpi) {
// side behavior is where the ALT ref buffer has opposite sign bias to // side behavior is where the ALT ref buffer has opposite sign bias to
// the other two. // the other two.
if (!frame_is_intra_only(cm)) { if (!frame_is_intra_only(cm)) {
#if !CONFIG_LOWDELAY_COMPOUND #if !CONFIG_ONE_SIDED_COMPOUND
if ((cm->ref_frame_sign_bias[ALTREF_FRAME] == if ((cm->ref_frame_sign_bias[ALTREF_FRAME] ==
cm->ref_frame_sign_bias[GOLDEN_FRAME]) || cm->ref_frame_sign_bias[GOLDEN_FRAME]) ||
(cm->ref_frame_sign_bias[ALTREF_FRAME] == (cm->ref_frame_sign_bias[ALTREF_FRAME] ==
...@@ -5458,8 +5458,8 @@ void av1_encode_frame(AV1_COMP *cpi) { ...@@ -5458,8 +5458,8 @@ void av1_encode_frame(AV1_COMP *cpi) {
cm->comp_fixed_ref = ALTREF_FRAME; cm->comp_fixed_ref = ALTREF_FRAME;
cm->comp_var_ref[0] = LAST_FRAME; cm->comp_var_ref[0] = LAST_FRAME;
cm->comp_var_ref[1] = GOLDEN_FRAME; cm->comp_var_ref[1] = GOLDEN_FRAME;
#endif // CONFIG_EXT_REFS #endif // CONFIG_EXT_REFS
#if !CONFIG_LOWDELAY_COMPOUND // Normative in encoder #if !CONFIG_ONE_SIDED_COMPOUND // Normative in encoder
} }
#endif #endif
} else { } else {
......
...@@ -324,7 +324,7 @@ static void setup_frame(AV1_COMP *cpi) { ...@@ -324,7 +324,7 @@ static void setup_frame(AV1_COMP *cpi) {
av1_zero(cpi->interp_filter_selected[0]); av1_zero(cpi->interp_filter_selected[0]);
} }
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
#if CONFIG_LOWDELAY_COMPOUND // No change to bitstream #if CONFIG_ONE_SIDED_COMPOUND // No change to bitstream
if (cpi->sf.recode_loop == DISALLOW_RECODE) { if (cpi->sf.recode_loop == DISALLOW_RECODE) {
cpi->refresh_bwd_ref_frame = cpi->refresh_last_frame; cpi->refresh_bwd_ref_frame = cpi->refresh_last_frame;
cpi->rc.is_bipred_frame = 1; cpi->rc.is_bipred_frame = 1;
...@@ -4292,7 +4292,7 @@ static int get_ref_frame_flags(const AV1_COMP *cpi) { ...@@ -4292,7 +4292,7 @@ static int get_ref_frame_flags(const AV1_COMP *cpi) {
const int last3_is_last = const int last3_is_last =
map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[0]]; map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[0]];
const int gld_is_last = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[0]]; const int gld_is_last = map[cpi->gld_fb_idx] == map[cpi->lst_fb_idxes[0]];
#if CONFIG_LOWDELAY_COMPOUND #if CONFIG_ONE_SIDED_COMPOUND
const int alt_is_last = map[cpi->alt_fb_idx] == map[cpi->lst_fb_idxes[0]]; const int alt_is_last = map[cpi->alt_fb_idx] == map[cpi->lst_fb_idxes[0]];
const int last3_is_last2 = const int last3_is_last2 =
map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[1]]; map[cpi->lst_fb_idxes[2]] == map[cpi->lst_fb_idxes[1]];
...@@ -4345,7 +4345,7 @@ static int get_ref_frame_flags(const AV1_COMP *cpi) { ...@@ -4345,7 +4345,7 @@ static int get_ref_frame_flags(const AV1_COMP *cpi) {
if (gld_is_last2 || gld_is_last3) flags &= ~AOM_GOLD_FLAG; if (gld_is_last2 || gld_is_last3) flags &= ~AOM_GOLD_FLAG;
#if CONFIG_LOWDELAY_COMPOUND // Changes LL & HL bitstream #if CONFIG_ONE_SIDED_COMPOUND // Changes LL & HL bitstream
/* Allow biprediction between two identical frames (e.g. bwd_is_last = 1) */ /* Allow biprediction between two identical frames (e.g. bwd_is_last = 1) */
if (bwd_is_alt && (flags & AOM_BWD_FLAG)) flags &= ~AOM_BWD_FLAG; if (bwd_is_alt && (flags & AOM_BWD_FLAG)) flags &= ~AOM_BWD_FLAG;
#else #else
......
...@@ -10330,7 +10330,7 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data, ...@@ -10330,7 +10330,7 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
// This is only used in motion vector unit test. // This is only used in motion vector unit test.
if (cpi->oxcf.motion_vector_unit_test && ref_frame == INTRA_FRAME) continue; if (cpi->oxcf.motion_vector_unit_test && ref_frame == INTRA_FRAME) continue;
#if CONFIG_LOWDELAY_COMPOUND // Changes LL bitstream #if CONFIG_ONE_SIDED_COMPOUND // Changes LL bitstream
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
if (cpi->oxcf.pass == 0) { if (cpi->oxcf.pass == 0) {
// Complexity-compression trade-offs // Complexity-compression trade-offs
...@@ -11946,7 +11946,7 @@ void av1_rd_pick_inter_mode_sub8x8(const struct AV1_COMP *cpi, ...@@ -11946,7 +11946,7 @@ void av1_rd_pick_inter_mode_sub8x8(const struct AV1_COMP *cpi,
// This is only used in motion vector unit test. // This is only used in motion vector unit test.
if (cpi->oxcf.motion_vector_unit_test && ref_frame == INTRA_FRAME) continue; if (cpi->oxcf.motion_vector_unit_test && ref_frame == INTRA_FRAME) continue;
#if CONFIG_LOWDELAY_COMPOUND // Changes LL bitstream #if CONFIG_ONE_SIDED_COMPOUND // Changes LL bitstream
#if CONFIG_EXT_REFS #if CONFIG_EXT_REFS
if (cpi->oxcf.pass == 0) { if (cpi->oxcf.pass == 0) {
// Complexity-compression trade-offs // Complexity-compression trade-offs
......
...@@ -315,7 +315,7 @@ EXPERIMENT_LIST=" ...@@ -315,7 +315,7 @@ EXPERIMENT_LIST="
new_multisymbol new_multisymbol
compound_singleref compound_singleref
aom_qm aom_qm
lowdelay_compound one_sided_compound
smooth_hv smooth_hv
var_refs var_refs
" "
......
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