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
efc7535b
Commit
efc7535b
authored
Oct 31, 2016
by
Yaowu Xu
Browse files
Refactor: read_tx_size_probs()
Change-Id: Ibdedd9b8e0b6646b882bc159856ac7c7e7073149
parent
1aceffa0
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
efc7535b
...
...
@@ -115,6 +115,14 @@ static TX_MODE read_tx_mode(struct aom_read_bit_buffer *rb) {
return
aom_rb_read_bit
(
rb
)
?
TX_MODE_SELECT
:
aom_rb_read_literal
(
rb
,
2
);
}
static
void
read_tx_size_probs
(
FRAME_CONTEXT
*
fc
,
aom_reader
*
r
)
{
int
i
,
j
,
k
;
for
(
i
=
0
;
i
<
MAX_TX_DEPTH
;
++
i
)
for
(
j
=
0
;
j
<
TX_SIZE_CONTEXTS
;
++
j
)
for
(
k
=
0
;
k
<
i
+
1
;
++
k
)
av1_diff_update_prob
(
r
,
&
fc
->
tx_size_probs
[
i
][
j
][
k
],
ACCT_STR
);
}
#if !CONFIG_EC_ADAPT
static
void
read_switchable_interp_probs
(
FRAME_CONTEXT
*
fc
,
aom_reader
*
r
)
{
int
i
,
j
;
...
...
@@ -3721,12 +3729,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
decode_restoration
(
cm
,
&
r
);
#endif
if
(
cm
->
tx_mode
==
TX_MODE_SELECT
)
{
for
(
i
=
0
;
i
<
MAX_TX_DEPTH
;
++
i
)
for
(
j
=
0
;
j
<
TX_SIZE_CONTEXTS
;
++
j
)
for
(
k
=
0
;
k
<
i
+
1
;
++
k
)
av1_diff_update_prob
(
&
r
,
&
fc
->
tx_size_probs
[
i
][
j
][
k
],
ACCT_STR
);
}
if
(
cm
->
tx_mode
==
TX_MODE_SELECT
)
read_tx_size_probs
(
fc
,
&
r
);
read_coef_probs
(
fc
,
cm
->
tx_mode
,
&
r
);
...
...
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