Skip to content
GitLab
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
41cea461
Commit
41cea461
authored
Oct 07, 2014
by
Jingning Han
Browse files
Use local variable in vp9_rd_pick_inter_mode_sb
Change-Id: Ie35a965a6b8de536ccaf61ff61498620d22db205
parent
f6ff752c
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
41cea461
...
...
@@ -2871,7 +2871,6 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
MACROBLOCKD
*
const
xd
=
&
x
->
e_mbd
;
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi
[
0
].
src_mi
->
mbmi
;
const
struct
segmentation
*
const
seg
=
&
cm
->
seg
;
struct
macroblockd_plane
*
const
pd
=
xd
->
plane
;
PREDICTION_MODE
this_mode
;
MV_REFERENCE_FRAME
ref_frame
,
second_ref_frame
;
unsigned
char
segment_id
=
mbmi
->
segment_id
;
...
...
@@ -3225,16 +3224,15 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
if
(
ref_frame
==
INTRA_FRAME
)
{
TX_SIZE
uv_tx
;
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
1
];
vpx_memset
(
x
->
skip_txfm
,
0
,
sizeof
(
x
->
skip_txfm
));
super_block_yrd
(
cpi
,
x
,
&
rate_y
,
&
distortion_y
,
&
skippable
,
NULL
,
bsize
,
tx_cache
,
best_rd
);
if
(
rate_y
==
INT_MAX
)
continue
;
uv_tx
=
get_uv_tx_size_impl
(
mbmi
->
tx_size
,
bsize
,
pd
[
1
].
subsampling_x
,
pd
[
1
].
subsampling_y
);
uv_tx
=
get_uv_tx_size_impl
(
mbmi
->
tx_size
,
bsize
,
pd
->
subsampling_x
,
pd
->
subsampling_y
);
if
(
rate_uv_intra
[
uv_tx
]
==
INT_MAX
)
{
choose_intra_uv_mode
(
cpi
,
ctx
,
bsize
,
uv_tx
,
&
rate_uv_intra
[
uv_tx
],
&
rate_uv_tokenonly
[
uv_tx
],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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