Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
a9bd85f7
Commit
a9bd85f7
authored
May 11, 2017
by
Luc Trudeau
Committed by
Michael Bebenita
May 11, 2017
Browse files
[CFL] Rename cfl_alpha_ind to cfl_alpha_idx
Change-Id: Id14d83bdce8321bef81972a4f5530a50589d9578
parent
ea166870
Changes
8
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
a9bd85f7
...
...
@@ -433,7 +433,7 @@ typedef struct MB_MODE_INFO {
#if CONFIG_CFL
// Index of the alpha Cb and alpha Cr combination
int
cfl_alpha_i
n
d
;
int
cfl_alpha_id
x
;
// Signs of alpha Cb and alpha Cr
CFL_SIGN_TYPE
cfl_alpha_signs
[
CFL_PRED_PLANES
];
#endif
...
...
av1/common/cfl.c
View file @
a9bd85f7
...
...
@@ -89,7 +89,7 @@ void cfl_dc_pred(MACROBLOCKD *xd, BLOCK_SIZE plane_bsize, TX_SIZE tx_size) {
double
cfl_ind_to_alpha
(
const
MB_MODE_INFO
*
const
mbmi
,
CFL_PRED_TYPE
pred_type
)
{
double
const
abs_alpha
=
cfl_alpha_codes
[
mbmi
->
cfl_alpha_i
n
d
][
pred_type
];
double
const
abs_alpha
=
cfl_alpha_codes
[
mbmi
->
cfl_alpha_id
x
][
pred_type
];
if
(
mbmi
->
cfl_alpha_signs
[
pred_type
]
==
CFL_SIGN_POS
)
{
return
abs_alpha
;
}
else
{
...
...
av1/decoder/decodemv.c
View file @
a9bd85f7
...
...
@@ -1131,7 +1131,7 @@ static void read_intra_frame_mode_info(AV1_COMMON *const cm,
#if CONFIG_CFL
// TODO(ltrudeau) support PALETTE
if
(
mbmi
->
uv_mode
==
DC_PRED
)
{
mbmi
->
cfl_alpha_i
n
d
=
read_cfl_alphas
(
mbmi
->
cfl_alpha_id
x
=
read_cfl_alphas
(
#if CONFIG_EC_ADAPT
xd
->
tile_ctx
,
#else
...
...
av1/decoder/inspection.c
View file @
a9bd85f7
...
...
@@ -102,11 +102,11 @@ int ifd_inspect(insp_frame_data *fd, void *decoder) {
#endif
#if CONFIG_CFL
if
(
mbmi
->
uv_mode
==
DC_PRED
)
{
mi
->
cfl_alpha_i
n
d
=
mbmi
->
cfl_alpha_i
n
d
;
mi
->
cfl_alpha_id
x
=
mbmi
->
cfl_alpha_id
x
;
mi
->
cfl_alpha_sign_u
=
mbmi
->
cfl_alpha_signs
[
CFL_PRED_U
];
mi
->
cfl_alpha_sign_v
=
mbmi
->
cfl_alpha_signs
[
CFL_PRED_V
];
}
else
{
mi
->
cfl_alpha_i
n
d
=
0
;
mi
->
cfl_alpha_id
x
=
0
;
mi
->
cfl_alpha_sign_u
=
0
;
mi
->
cfl_alpha_sign_v
=
0
;
}
...
...
av1/decoder/inspection.h
View file @
a9bd85f7
...
...
@@ -50,7 +50,7 @@ struct insp_mi_data {
int8_t
cdef_strength
;
#endif
#if CONFIG_CFL
int8_t
cfl_alpha_i
n
d
;
int8_t
cfl_alpha_id
x
;
int8_t
cfl_alpha_sign_u
;
int8_t
cfl_alpha_sign_v
;
#endif
...
...
av1/encoder/bitstream.c
View file @
a9bd85f7
...
...
@@ -2201,7 +2201,7 @@ static void write_mb_modes_kf(AV1_COMMON *cm,
#if CONFIG_CFL
if
(
mbmi
->
uv_mode
==
DC_PRED
)
{
write_cfl_alphas
(
ec_ctx
,
mbmi
->
skip
,
mbmi
->
cfl_alpha_i
n
d
,
write_cfl_alphas
(
ec_ctx
,
mbmi
->
skip
,
mbmi
->
cfl_alpha_id
x
,
mbmi
->
cfl_alpha_signs
,
w
);
}
#endif
...
...
av1/encoder/encodemb.c
View file @
a9bd85f7
...
...
@@ -1495,7 +1495,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
// if SKIP is chosen at the block level, and ind != 0, we must change
// the prediction
if
(
mbmi
->
cfl_alpha_i
n
d
!=
0
)
{
if
(
mbmi
->
cfl_alpha_id
x
!=
0
)
{
const
struct
macroblockd_plane
*
const
pd_cb
=
&
xd
->
plane
[
AOM_PLANE_U
];
uint8_t
*
const
dst_cb
=
pd_cb
->
dst
.
buf
;
const
int
dst_stride_cb
=
pd_cb
->
dst
.
stride
;
...
...
@@ -1509,7 +1509,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
(
uint8_t
)(
xd
->
cfl
->
dc_pred
[
CFL_PRED_V
]
+
0
.
5
);
}
}
mbmi
->
cfl_alpha_i
n
d
=
0
;
mbmi
->
cfl_alpha_id
x
=
0
;
mbmi
->
cfl_alpha_signs
[
CFL_PRED_U
]
=
CFL_SIGN_POS
;
mbmi
->
cfl_alpha_signs
[
CFL_PRED_V
]
=
CFL_SIGN_POS
;
}
...
...
@@ -1657,7 +1657,7 @@ void av1_predict_intra_block_encoder_facade(MACROBLOCK *x, int plane,
av1_cost_literal
(
sign_bit_cost
);
}
cfl_dc_pred
(
xd
,
plane_bsize
,
tx_size
);
mbmi
->
cfl_alpha_i
n
d
=
cfl_compute_alpha_ind
(
mbmi
->
cfl_alpha_id
x
=
cfl_compute_alpha_ind
(
x
,
cfl
,
plane_bsize
,
cfl_costs
,
mbmi
->
cfl_alpha_signs
);
}
}
...
...
examples/inspect.c
View file @
a9bd85f7
...
...
@@ -499,8 +499,8 @@ void inspect(void *pbi, void *data) {
#endif
#if CONFIG_CFL
if
(
layers
&
CFL_LAYER
)
{
buf
+=
put_block_info
(
buf
,
NULL
,
"cfl_alpha_i
n
d"
,
offsetof
(
insp_mi_data
,
cfl_alpha_i
n
d
));
buf
+=
put_block_info
(
buf
,
NULL
,
"cfl_alpha_id
x
"
,
offsetof
(
insp_mi_data
,
cfl_alpha_id
x
));
buf
+=
put_block_info
(
buf
,
NULL
,
"cfl_alpha_sign_u"
,
offsetof
(
insp_mi_data
,
cfl_alpha_sign_u
));
buf
+=
put_block_info
(
buf
,
NULL
,
"cfl_alpha_sign_v"
,
...
...
Write
Preview
Supports
Markdown
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