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
6e3c7849
Commit
6e3c7849
authored
Oct 12, 2012
by
Adrian Grange
Committed by
Gerrit Code Review
Oct 12, 2012
Browse files
Merge "Remove reverting of tx-select if only a single txfm-size is used." into experimental
parents
707e6c30
5a4ea8be
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp8/encoder/encodeframe.c
View file @
6e3c7849
...
...
@@ -1458,6 +1458,32 @@ static int check_dual_ref_flags(VP8_COMP *cpi) {
}
}
#if CONFIG_TX_SELECT
static
void
reset_skip_txfm_size
(
VP8_COMP
*
cpi
,
TX_SIZE
txfm_max
)
{
VP8_COMMON
*
cm
=
&
cpi
->
common
;
int
mb_row
,
mb_col
,
mis
=
cm
->
mode_info_stride
;
MODE_INFO
*
mi
,
*
mi_ptr
=
cm
->
mi
;
MB_MODE_INFO
*
mbmi
;
MACROBLOCK
*
x
=
&
cpi
->
mb
;
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
for
(
mb_row
=
0
;
mb_row
<
cm
->
mb_rows
;
mb_row
++
,
mi_ptr
+=
mis
)
{
mi
=
mi_ptr
;
for
(
mb_col
=
0
;
mb_col
<
cm
->
mb_cols
;
mb_col
++
,
mi
++
)
{
mbmi
=
&
mi
->
mbmi
;
if
(
mbmi
->
txfm_size
>
txfm_max
)
{
int
segment_id
=
mbmi
->
segment_id
;
xd
->
mode_info_context
=
mi
;
assert
((
segfeature_active
(
xd
,
segment_id
,
SEG_LVL_EOB
)
&&
get_segdata
(
xd
,
segment_id
,
SEG_LVL_EOB
)
==
0
)
||
(
cm
->
mb_no_coeff_skip
&&
mbmi
->
mb_skip_coeff
));
mbmi
->
txfm_size
=
txfm_max
;
}
}
}
}
#endif
void
vp8_encode_frame
(
VP8_COMP
*
cpi
)
{
if
(
cpi
->
sf
.
RD
)
{
int
i
,
frame_type
,
pred_type
;
...
...
@@ -1606,8 +1632,10 @@ void vp8_encode_frame(VP8_COMP *cpi) {
if
(
count4x4
==
0
&&
count16x16
==
0
)
{
cpi
->
common
.
txfm_mode
=
ALLOW_8X8
;
reset_skip_txfm_size
(
cpi
,
TX_8X8
);
}
else
if
(
count8x8
==
0
&&
count16x16
==
0
&&
count8x8_8x8p
==
0
)
{
cpi
->
common
.
txfm_mode
=
ONLY_4X4
;
reset_skip_txfm_size
(
cpi
,
TX_4X4
);
}
else
if
(
count8x8
==
0
&&
count4x4
==
0
)
{
cpi
->
common
.
txfm_mode
=
ALLOW_16X16
;
}
...
...
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