Skip to content
GitLab
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
489dad8f
Commit
489dad8f
authored
Jan 11, 2017
by
Thomas Davies
Browse files
EC_ADAPT: use tile context for coefficients.
Change-Id: I61433d0c0bbab9b7cf74a405cbedd60965318888
parent
1bfb5eda
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/decoder/detokenize.c
View file @
489dad8f
...
...
@@ -80,7 +80,11 @@ static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
aom_prob
(
*
coef_probs
)[
COEFF_CONTEXTS
][
UNCONSTRAINED_NODES
]
=
fc
->
coef_probs
[
tx_size_ctx
][
type
][
ref
];
const
aom_prob
*
prob
;
#if CONFIG_EC_MULTISYMBOL
#if CONFIG_EC_ADAPT
aom_cdf_prob
(
*
coef_cdfs
)[
COEFF_CONTEXTS
][
ENTROPY_TOKENS
]
=
xd
->
tile_ctx
->
coef_cdfs
[
tx_size
][
type
][
ref
];
aom_cdf_prob
(
*
cdf
)[
ENTROPY_TOKENS
];
#elif CONFIG_EC_MULTISYMBOL
aom_cdf_prob
(
*
coef_cdfs
)[
COEFF_CONTEXTS
][
ENTROPY_TOKENS
]
=
fc
->
coef_cdfs
[
tx_size_ctx
][
type
][
ref
];
aom_cdf_prob
(
*
cdf
)[
ENTROPY_TOKENS
];
...
...
av1/encoder/tokenize.c
View file @
489dad8f
...
...
@@ -463,7 +463,11 @@ static void tokenize_b(int plane, int block, int blk_row, int blk_col,
aom_prob
(
*
const
coef_probs
)[
COEFF_CONTEXTS
][
UNCONSTRAINED_NODES
]
=
cpi
->
common
.
fc
->
coef_probs
[
txsize_sqr_map
[
tx_size
]][
type
][
ref
];
#endif // CONFIG_ENTROPY
#if CONFIG_EC_MULTISYMBOL
#if CONFIG_EC_ADAPT // use per-tile context
aom_cdf_prob
(
*
const
coef_cdfs
)[
COEFF_CONTEXTS
][
ENTROPY_TOKENS
]
=
xd
->
tile_ctx
->
coef_cdfs
[
tx_size
][
type
][
ref
];
#elif CONFIG_EC_MULTISYMBOL
aom_cdf_prob
(
*
const
coef_cdfs
)[
COEFF_CONTEXTS
][
ENTROPY_TOKENS
]
=
cpi
->
common
.
fc
->
coef_cdfs
[
tx_size
][
type
][
ref
];
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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