Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
78bfc285
Commit
78bfc285
authored
May 24, 2017
by
Arild Fuldseth (arilfuld)
Committed by
Arild Fuldseth
May 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename LOWDELAY_COMPOUND to ONE_SIDED_COMPOUND
Change-Id: I05b2c8c116b5e3287be2703e840a28f6dda9c42a
parent
a77ec1c9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
19 deletions
+19
-19
av1/common/pred_common.c
av1/common/pred_common.c
+8
-8
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+1
-1
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+1
-1
av1/encoder/encodeframe.c
av1/encoder/encodeframe.c
+3
-3
av1/encoder/encoder.c
av1/encoder/encoder.c
+3
-3
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+2
-2
configure
configure
+1
-1
No files found.
av1/common/pred_common.c
View file @
78bfc285
...
...
@@ -320,7 +320,7 @@ int av1_get_reference_mode_context(const AV1_COMMON *cm,
//
// NOTE(zoeliu): The probability of ref_frame[0] is either
// 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
,
const
MACROBLOCKD
*
xd
)
{
#else
...
...
@@ -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
// left of the entries correpsonding to real macroblocks.
// 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
const
int
bwd_ref_sign_idx
=
1
;
#else
...
...
@@ -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,
// 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
,
const
MACROBLOCKD
*
xd
)
{
#else
...
...
@@ -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
// left of the entries correpsonding to real macroblocks.
// 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
const
int
bwd_ref_sign_idx
=
1
;
#else
...
...
@@ -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,
// 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
,
const
MACROBLOCKD
*
xd
)
{
#else
...
...
@@ -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
// left of the entries correpsonding to real macroblocks.
// 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
const
int
bwd_ref_sign_idx
=
1
;
#else
...
...
@@ -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
#if CONFIG_
LOWDELAY
_COMPOUND
#if CONFIG_
ONE_SIDED
_COMPOUND
int
av1_get_pred_context_comp_bwdref_p
(
UNUSED
const
AV1_COMMON
*
cm
,
const
MACROBLOCKD
*
xd
)
{
#else
...
...
@@ -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
// left of the entries corresponding to real macroblocks.
// 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
const
int
bwd_ref_sign_idx
=
1
;
#else
...
...
av1/decoder/decodeframe.c
View file @
78bfc285
...
...
@@ -92,7 +92,7 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
struct
aom_read_bit_buffer
*
rb
);
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
);
#else
int
i
;
...
...
av1/decoder/decodemv.c
View file @
78bfc285
...
...
@@ -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
);
// FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding
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
;
#else
#if CONFIG_EXT_REFS
...
...
av1/encoder/encodeframe.c
View file @
78bfc285
...
...
@@ -5438,7 +5438,7 @@ void av1_encode_frame(AV1_COMP *cpi) {
// side behavior is where the ALT ref buffer has opposite sign bias to
// the other two.
if
(
!
frame_is_intra_only
(
cm
))
{
#if !CONFIG_
LOWDELAY
_COMPOUND
#if !CONFIG_
ONE_SIDED
_COMPOUND
if
((
cm
->
ref_frame_sign_bias
[
ALTREF_FRAME
]
==
cm
->
ref_frame_sign_bias
[
GOLDEN_FRAME
])
||
(
cm
->
ref_frame_sign_bias
[
ALTREF_FRAME
]
==
...
...
@@ -5458,8 +5458,8 @@ void av1_encode_frame(AV1_COMP *cpi) {
cm
->
comp_fixed_ref
=
ALTREF_FRAME
;
cm
->
comp_var_ref
[
0
]
=
LAST_FRAME
;
cm
->
comp_var_ref
[
1
]
=
GOLDEN_FRAME
;
#endif // CONFIG_EXT_REFS
#if !CONFIG_
LOWDELAY
_COMPOUND // Normative in encoder
#endif
// CONFIG_EXT_REFS
#if !CONFIG_
ONE_SIDED
_COMPOUND // Normative in encoder
}
#endif
}
else
{
...
...
av1/encoder/encoder.c
View file @
78bfc285
...
...
@@ -324,7 +324,7 @@ static void setup_frame(AV1_COMP *cpi) {
av1_zero
(
cpi
->
interp_filter_selected
[
0
]);
}
#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
)
{
cpi
->
refresh_bwd_ref_frame
=
cpi
->
refresh_last_frame
;
cpi
->
rc
.
is_bipred_frame
=
1
;
...
...
@@ -4292,7 +4292,7 @@ static int get_ref_frame_flags(const AV1_COMP *cpi) {
const
int
last3_is_last
=
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
]];
#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
last3_is_last2
=
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) {
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) */
if
(
bwd_is_alt
&&
(
flags
&
AOM_BWD_FLAG
))
flags
&=
~
AOM_BWD_FLAG
;
#else
...
...
av1/encoder/rdopt.c
View file @
78bfc285
...
...
@@ -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.
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 (cpi->oxcf.pass == 0) {
// Complexity-compression trade-offs
...
...
@@ -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.
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 (cpi->oxcf.pass == 0) {
// Complexity-compression trade-offs
...
...
configure
View file @
78bfc285
...
...
@@ -315,7 +315,7 @@ EXPERIMENT_LIST="
new_multisymbol
compound_singleref
aom_qm
lowdelay
_compound
one_sided
_compound
smooth_hv
var_refs
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment