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
08468197
Commit
08468197
authored
Oct 05, 2017
by
Hui Su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove entropy-stats code on decoder side
Change-Id: I22f4ea3b8348816d4592645e9994b4b0ff29868c
parent
34e3a145
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
34 deletions
+0
-34
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+0
-12
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+0
-22
No files found.
av1/decoder/decodeframe.c
View file @
08468197
...
...
@@ -5303,12 +5303,6 @@ static void debug_check_frame_counts(const AV1_COMMON *const cm) {
av1_zero
(
zero_counts
);
assert
(
cm
->
refresh_frame_context
!=
REFRESH_FRAME_CONTEXT_BACKWARD
||
cm
->
error_resilient_mode
);
#if CONFIG_ENTROPY_STATS
assert
(
!
memcmp
(
cm
->
counts
.
y_mode
,
zero_counts
.
y_mode
,
sizeof
(
cm
->
counts
.
y_mode
)));
assert
(
!
memcmp
(
cm
->
counts
.
uv_mode
,
zero_counts
.
uv_mode
,
sizeof
(
cm
->
counts
.
uv_mode
)));
#endif
assert
(
!
memcmp
(
cm
->
counts
.
partition
,
zero_counts
.
partition
,
sizeof
(
cm
->
counts
.
partition
)));
assert
(
!
memcmp
(
cm
->
counts
.
switchable_interp
,
zero_counts
.
switchable_interp
,
...
...
@@ -5364,12 +5358,6 @@ static void debug_check_frame_counts(const AV1_COMMON *const cm) {
!
memcmp
(
&
cm
->
counts
.
mv
[
0
],
&
zero_counts
.
mv
[
0
],
sizeof
(
cm
->
counts
.
mv
[
0
])));
assert
(
!
memcmp
(
&
cm
->
counts
.
mv
[
1
],
&
zero_counts
.
mv
[
1
],
sizeof
(
cm
->
counts
.
mv
[
0
])));
#if CONFIG_ENTROPY_STATS
assert
(
!
memcmp
(
cm
->
counts
.
inter_ext_tx
,
zero_counts
.
inter_ext_tx
,
sizeof
(
cm
->
counts
.
inter_ext_tx
)));
assert
(
!
memcmp
(
cm
->
counts
.
intra_ext_tx
,
zero_counts
.
intra_ext_tx
,
sizeof
(
cm
->
counts
.
intra_ext_tx
)));
#endif // CONFIG_ENTROPY_STATS
}
#endif // NDEBUG
...
...
av1/decoder/decodemv.c
View file @
08468197
...
...
@@ -145,13 +145,8 @@ static PREDICTION_MODE read_intra_mode_y(FRAME_CONTEXT *ec_ctx, MACROBLOCKD *xd,
aom_reader
*
r
,
int
size_group
)
{
const
PREDICTION_MODE
y_mode
=
read_intra_mode
(
r
,
ec_ctx
->
y_mode_cdf
[
size_group
]);
#if CONFIG_ENTROPY_STATS
FRAME_COUNTS
*
counts
=
xd
->
counts
;
if
(
counts
)
++
counts
->
y_mode
[
size_group
][
y_mode
];
#else
/* TODO(negge): Can we remove this parameter? */
(
void
)
xd
;
#endif // CONFIG_ENTROPY_STATS
return
y_mode
;
}
...
...
@@ -164,14 +159,7 @@ static UV_PREDICTION_MODE read_intra_mode_uv(FRAME_CONTEXT *ec_ctx,
#else
read_intra_mode
(
r
,
ec_ctx
->
uv_mode_cdf
[
y_mode
]);
#endif // CONFIG_CFL
#if CONFIG_ENTROPY_STATS
FRAME_COUNTS
*
counts
=
xd
->
counts
;
if
(
counts
)
++
counts
->
uv_mode
[
y_mode
][
uv_mode
];
#else
/* TODO(negge): Can we remove this parameter? */
(
void
)
xd
;
#endif // CONFIG_ENTROPY_STATS
return
uv_mode
;
}
...
...
@@ -1040,24 +1028,14 @@ void av1_read_tx_type(const AV1_COMMON *const cm, MACROBLOCKD *xd,
// eset == 0 should correspond to a set with only DCT_DCT and
// there is no need to read the tx_type
assert
(
eset
!=
0
);
#if CONFIG_ENTROPY_STATS
FRAME_COUNTS
*
counts
=
xd
->
counts
;
#endif // CONFIG_ENTROPY_STATS
if
(
inter_block
)
{
*
tx_type
=
av1_ext_tx_inv
[
tx_set_type
][
aom_read_symbol
(
r
,
ec_ctx
->
inter_ext_tx_cdf
[
eset
][
square_tx_size
],
av1_num_ext_tx_set
[
tx_set_type
],
ACCT_STR
)];
#if CONFIG_ENTROPY_STATS
if
(
counts
)
++
counts
->
inter_ext_tx
[
eset
][
square_tx_size
][
*
tx_type
];
#endif // CONFIG_ENTROPY_STATS
}
else
if
(
ALLOW_INTRA_EXT_TX
)
{
*
tx_type
=
av1_ext_tx_inv
[
tx_set_type
][
aom_read_symbol
(
r
,
ec_ctx
->
intra_ext_tx_cdf
[
eset
][
square_tx_size
][
mbmi
->
mode
],
av1_num_ext_tx_set
[
tx_set_type
],
ACCT_STR
)];
#if CONFIG_ENTROPY_STATS
if
(
counts
)
++
counts
->
intra_ext_tx
[
eset
][
square_tx_size
][
mbmi
->
mode
][
*
tx_type
];
#endif // CONFIG_ENTROPY_STATS
}
}
else
{
*
tx_type
=
DCT_DCT
;
...
...
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