Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
9641a89b
Commit
9641a89b
authored
Feb 19, 2018
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reset txk_type after reset_tx_size()
BUG=aomedia:1404 Change-Id: Ie52ef049a33a47915869a424f2ca73d706d8e5d0
parent
e11b68d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
av1/encoder/encodeframe.c
av1/encoder/encodeframe.c
+10
-0
No files found.
av1/encoder/encodeframe.c
View file @
9641a89b
...
...
@@ -480,6 +480,11 @@ static void update_state(const AV1_COMP *const cpi, TileDataEnc *tile_data,
seg
->
update_map
?
cpi
->
segmentation_map
:
cm
->
last_frame_seg_map
;
mbmi
->
segment_id
=
get_segment_id
(
cm
,
map
,
bsize
,
mi_row
,
mi_col
);
reset_tx_size
(
xd
,
mbmi
,
cm
->
tx_mode
);
#if CONFIG_TXK_SEL
memset
(
mbmi
->
txk_type
,
DCT_DCT
,
sizeof
(
mbmi
->
txk_type
[
0
])
*
(
MAX_SB_SQUARE
/
(
TX_SIZE_W_MIN
*
TX_SIZE_H_MIN
)));
#endif
}
// Else for cyclic refresh mode update the segment map, set the segment id
// and then update the quantizer.
...
...
@@ -487,6 +492,11 @@ static void update_state(const AV1_COMP *const cpi, TileDataEnc *tile_data,
av1_cyclic_refresh_update_segment
(
cpi
,
mbmi
,
mi_row
,
mi_col
,
bsize
,
ctx
->
rate
,
ctx
->
dist
,
x
->
skip
);
reset_tx_size
(
xd
,
mbmi
,
cm
->
tx_mode
);
#if CONFIG_TXK_SEL
memset
(
mbmi
->
txk_type
,
DCT_DCT
,
sizeof
(
mbmi
->
txk_type
[
0
])
*
(
MAX_SB_SQUARE
/
(
TX_SIZE_W_MIN
*
TX_SIZE_H_MIN
)));
#endif
}
}
...
...
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