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
dea4d313
Commit
dea4d313
authored
Oct 24, 2017
by
Sebastien Alaiwan
Committed by
Urvang Joshi
Oct 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead struct member
Change-Id: Id228c94fbe6005ac37a59bb8c23cfb0f95f97af0
parent
129afee7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
13 deletions
+0
-13
av1/common/entropymode.h
av1/common/entropymode.h
+0
-3
av1/decoder/decodeframe.c
av1/decoder/decodeframe.c
+0
-2
av1/decoder/decodemv.c
av1/decoder/decodemv.c
+0
-2
av1/encoder/encodeframe.c
av1/encoder/encodeframe.c
+0
-6
No files found.
av1/common/entropymode.h
View file @
dea4d313
...
...
@@ -482,9 +482,6 @@ typedef struct FRAME_COUNTS {
#if CONFIG_COMPOUND_SINGLEREF
unsigned
int
comp_inter_mode
[
COMP_INTER_MODE_CONTEXTS
][
2
];
#endif // CONFIG_COMPOUND_SINGLEREF
// TODO(urvang): Only needed for !CONFIG_VAR_TX case. So can be removed when
// CONFIG_VAR_TX flag is removed.
unsigned
int
tx_size
[
MAX_TX_DEPTH
][
TX_SIZE_CONTEXTS
][
MAX_TX_DEPTH
+
1
];
#if CONFIG_RECT_TX_EXT
unsigned
int
quarter_tx_size
[
2
];
#endif
...
...
av1/decoder/decodeframe.c
View file @
dea4d313
...
...
@@ -3636,8 +3636,6 @@ static void debug_check_frame_counts(const AV1_COMMON *const cm) {
sizeof
(
cm
->
counts
.
comp_ref
)));
assert
(
!
memcmp
(
cm
->
counts
.
comp_bwdref
,
zero_counts
.
comp_bwdref
,
sizeof
(
cm
->
counts
.
comp_bwdref
)));
assert
(
!
memcmp
(
&
cm
->
counts
.
tx_size
,
&
zero_counts
.
tx_size
,
sizeof
(
cm
->
counts
.
tx_size
)));
assert
(
!
memcmp
(
cm
->
counts
.
skip
,
zero_counts
.
skip
,
sizeof
(
cm
->
counts
.
skip
)));
assert
(
!
memcmp
(
&
cm
->
counts
.
mv
[
0
],
&
zero_counts
.
mv
[
0
],
sizeof
(
cm
->
counts
.
mv
[
0
])));
...
...
av1/decoder/decodemv.c
View file @
dea4d313
...
...
@@ -474,7 +474,6 @@ static void read_tx_size_vartx(AV1_COMMON *cm, MACROBLOCKD *xd,
static
TX_SIZE
read_selected_tx_size
(
AV1_COMMON
*
cm
,
MACROBLOCKD
*
xd
,
int32_t
tx_size_cat
,
aom_reader
*
r
)
{
FRAME_COUNTS
*
counts
=
xd
->
counts
;
const
int
ctx
=
get_tx_size_context
(
xd
);
FRAME_CONTEXT
*
ec_ctx
=
xd
->
tile_ctx
;
(
void
)
cm
;
...
...
@@ -485,7 +484,6 @@ static TX_SIZE read_selected_tx_size(AV1_COMMON *cm, MACROBLOCKD *xd,
#if CONFIG_RECT_TX
assert
(
!
is_rect_tx
(
tx_size
));
#endif // CONFIG_RECT_TX
if
(
counts
)
++
counts
->
tx_size
[
tx_size_cat
][
ctx
][
depth
];
return
tx_size
;
}
...
...
av1/encoder/encodeframe.c
View file @
dea4d313
...
...
@@ -4728,12 +4728,6 @@ static void encode_superblock(const AV1_COMP *const cpi, ThreadData *td,
if
(
is_inter
)
{
tx_partition_count_update
(
cm
,
x
,
bsize
,
mi_row
,
mi_col
,
td
->
counts
);
}
else
{
const
int
tx_size_ctx
=
get_tx_size_context
(
xd
);
const
int32_t
tx_size_cat
=
is_inter
?
inter_tx_size_cat_lookup
[
bsize
]
:
intra_tx_size_cat_lookup
[
bsize
];
const
TX_SIZE
coded_tx_size
=
txsize_sqr_up_map
[
tx_size
];
const
int
depth
=
tx_size_to_depth
(
coded_tx_size
);
++
td
->
counts
->
tx_size
[
tx_size_cat
][
tx_size_ctx
][
depth
];
if
(
tx_size
!=
max_txsize_rect_lookup
[
bsize
])
++
x
->
txb_split_count
;
}
...
...
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