Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
9ac7a9dc
Commit
9ac7a9dc
authored
Aug 18, 2016
by
Nathan E. Egge
Committed by
Nathan Egge
Aug 18, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename aom_read_tree_cdf() to aom_read_symbol().
Change-Id: Ifc065eb3eee0960be2e085e7e18478bf91bf56dd
parent
b6ec6381
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
aom_dsp/bitreader.h
aom_dsp/bitreader.h
+2
-2
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+2
-2
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+3
-3
av1/decoder/detokenize.c
av1/decoder/detokenize.c
+1
-1
No files found.
aom_dsp/bitreader.h
View file @
9ac7a9dc
...
...
@@ -131,8 +131,8 @@ static INLINE int aom_read_tree(aom_reader *r, const aom_tree_index *tree,
#endif
}
static
INLINE
int
aom_read_
tree_cdf
(
aom_reader
*
r
,
const
uint16_t
*
cdf
,
int
nsymbs
)
{
static
INLINE
int
aom_read_
symbol
(
aom_reader
*
r
,
const
uint16_t
*
cdf
,
int
nsymbs
)
{
#if CONFIG_RANS
(
void
)
nsymbs
;
return
rans_read
(
r
,
cdf
);
...
...
av1/decoder/decodeframe.c
View file @
9ac7a9dc
...
...
@@ -599,8 +599,8 @@ static PARTITION_TYPE read_partition(AV1_COMMON *cm, MACROBLOCKD *xd,
if
(
has_rows
&&
has_cols
)
#if CONFIG_DAALA_EC
p
=
(
PARTITION_TYPE
)
aom_read_
tree_cdf
(
r
,
cm
->
fc
->
partition_cdf
[
ctx
],
PARTITION_TYPES
);
p
=
(
PARTITION_TYPE
)
aom_read_
symbol
(
r
,
cm
->
fc
->
partition_cdf
[
ctx
],
PARTITION_TYPES
);
#else
p
=
(
PARTITION_TYPE
)
aom_read_tree
(
r
,
av1_partition_tree
,
probs
);
#endif
...
...
av1/decoder/decodemv.c
View file @
9ac7a9dc
...
...
@@ -596,7 +596,7 @@ static INLINE InterpFilter read_switchable_interp_filter(AV1_COMMON *const cm,
const
int
ctx
=
av1_get_pred_context_switchable_interp
(
xd
);
#if CONFIG_DAALA_EC
const
InterpFilter
type
=
(
InterpFilter
)
av1_switchable_interp_inv
[
aom_read_
tree_cdf
(
(
InterpFilter
)
av1_switchable_interp_inv
[
aom_read_
symbol
(
r
,
cm
->
fc
->
switchable_interp_cdf
[
ctx
],
SWITCHABLE_FILTERS
)];
#else
const
InterpFilter
type
=
(
InterpFilter
)
aom_read_tree
(
...
...
@@ -972,7 +972,7 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
FRAME_COUNTS
*
counts
=
xd
->
counts
;
if
(
inter_block
)
{
#if CONFIG_DAALA_EC
mbmi
->
tx_type
=
av1_ext_tx_inv
[
aom_read_
tree_cdf
(
mbmi
->
tx_type
=
av1_ext_tx_inv
[
aom_read_
symbol
(
r
,
cm
->
fc
->
inter_ext_tx_cdf
[
mbmi
->
tx_size
],
TX_TYPES
)];
#else
mbmi
->
tx_type
=
aom_read_tree
(
r
,
av1_ext_tx_tree
,
...
...
@@ -982,7 +982,7 @@ static void read_inter_frame_mode_info(AV1Decoder *const pbi,
}
else
{
const
TX_TYPE
tx_type_nom
=
intra_mode_to_tx_type_context
[
mbmi
->
mode
];
#if CONFIG_DAALA_EC
mbmi
->
tx_type
=
av1_ext_tx_inv
[
aom_read_
tree_cdf
(
mbmi
->
tx_type
=
av1_ext_tx_inv
[
aom_read_
symbol
(
r
,
cm
->
fc
->
intra_ext_tx_cdf
[
mbmi
->
tx_size
][
tx_type_nom
],
TX_TYPES
)];
#else
mbmi
->
tx_type
=
...
...
av1/decoder/detokenize.c
View file @
9ac7a9dc
...
...
@@ -149,7 +149,7 @@ static int decode_coefs(const MACROBLOCKD *xd, PLANE_TYPE type,
#if CONFIG_RANS
cdf
=
&
coef_cdfs
[
band
][
ctx
];
token
=
ONE_TOKEN
+
aom_read_
tree_cdf
(
r
,
*
cdf
,
CATEGORY6_TOKEN
-
ONE_TOKEN
+
1
);
ONE_TOKEN
+
aom_read_
symbol
(
r
,
*
cdf
,
CATEGORY6_TOKEN
-
ONE_TOKEN
+
1
);
INCREMENT_COUNT
(
ONE_TOKEN
+
(
token
>
ONE_TOKEN
));
switch
(
token
)
{
case
ONE_TOKEN
:
...
...
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