Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
ae0e747d
Commit
ae0e747d
authored
Oct 23, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Oct 23, 2013
Browse files
Merge "Use inter mode flag in super_block_yrd"
parents
5bdd4d9c
f3b31380
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
ae0e747d
...
...
@@ -933,14 +933,15 @@ static void super_block_yrd(VP9_COMP *cpi,
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi_8x8
[
0
]
->
mbmi
;
struct
rdcost_block_args
*
rdcost_stack
=
&
cpi
->
rdcost_stack
;
const
int
b_inter_mode
=
is_inter_block
(
mbmi
);
assert
(
bs
==
mbmi
->
sb_type
);
if
(
mbmi
->
ref_frame
[
0
]
>
INTRA_FRAME
)
if
(
b_inter_mode
)
vp9_subtract_sby
(
x
,
bs
);
if
(
cpi
->
sf
.
tx_size_search_method
==
USE_LARGESTALL
||
(
cpi
->
sf
.
tx_size_search_method
!=
USE_FULL_RD
&&
mbmi
->
ref_frame
[
0
]
==
INTRA_FRAME
))
{
!
b_inter_mode
))
{
vpx_memset
(
txfm_cache
,
0
,
TX_MODES
*
sizeof
(
int64_t
));
choose_largest_txfm_size
(
cpi
,
x
,
rate
,
distortion
,
skip
,
sse
,
ref_best_rd
,
bs
);
...
...
@@ -950,7 +951,7 @@ static void super_block_yrd(VP9_COMP *cpi,
}
if
(
cpi
->
sf
.
tx_size_search_method
==
USE_LARGESTINTRA_MODELINTER
&&
mbmi
->
ref_frame
[
0
]
>
INTRA_FRAME
)
{
b_inter_mode
)
{
if
(
bs
>=
BLOCK_32X32
)
model_rd_for_sb_y_tx
(
cpi
,
bs
,
TX_32X32
,
x
,
xd
,
&
r
[
TX_32X32
][
0
],
&
d
[
TX_32X32
],
&
s
[
TX_32X32
]);
...
...
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