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
9a27b627
Commit
9a27b627
authored
May 28, 2013
by
Scott LaVarnway
Committed by
Gerrit Code Review
May 28, 2013
Browse files
Merge "Removed setup_pre_planes() call in read_mb_modes_mv()" into experimental
parents
245a1155
64b30f41
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodemv.c
View file @
9a27b627
...
...
@@ -574,18 +574,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
int_mv
nearest
,
nearby
,
best_mv
;
int_mv
nearest_second
,
nearby_second
,
best_mv_second
;
vp9_prob
mv_ref_p
[
VP9_MVREFS
-
1
];
const
MV_REFERENCE_FRAME
ref_frame
=
mbmi
->
ref_frame
;
struct
scale_factors
*
sf0
=
&
xd
->
scale_factor
[
0
];
*
sf0
=
cm
->
active_ref_scale
[
mbmi
->
ref_frame
-
1
];
{
// Select the appropriate reference frame for this MB
const
int
ref_fb_idx
=
cm
->
active_ref_idx
[
ref_frame
-
1
];
setup_pre_planes
(
xd
,
&
cm
->
yv12_fb
[
ref_fb_idx
],
NULL
,
mi_row
,
mi_col
,
xd
->
scale_factor
,
xd
->
scale_factor_uv
);
#ifdef DEC_DEBUG
if
(
dec_debug
)
printf
(
"%d %d
\n
"
,
xd
->
mode_info_context
->
mbmi
.
mv
[
0
].
as_mv
.
row
,
...
...
@@ -644,12 +635,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
mbmi
->
second_ref_frame
=
1
;
if
(
mbmi
->
second_ref_frame
>
0
)
{
const
MV_REFERENCE_FRAME
second_ref_frame
=
mbmi
->
second_ref_frame
;
struct
scale_factors
*
sf1
=
&
xd
->
scale_factor
[
1
];
const
int
second_ref_fb_idx
=
cm
->
active_ref_idx
[
second_ref_frame
-
1
];
*
sf1
=
cm
->
active_ref_scale
[
second_ref_frame
-
1
];
setup_pre_planes
(
xd
,
NULL
,
&
cm
->
yv12_fb
[
second_ref_fb_idx
],
mi_row
,
mi_col
,
xd
->
scale_factor
,
xd
->
scale_factor_uv
);
vp9_find_mv_refs
(
cm
,
xd
,
mi
,
use_prev_in_find_mv_refs
?
...
...
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