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
73aa5b76
Commit
73aa5b76
authored
Apr 10, 2014
by
Dmitry Kovalev
Browse files
Replacing int_mv with MV.
Change-Id: I1020dec1ac2e9404a8efcc04681a050417b8b065
parent
b5bf6466
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
73aa5b76
...
...
@@ -2580,7 +2580,7 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
struct
buf_2d
ref_yv12
[
2
];
int
bestsme
=
INT_MAX
;
int
sadpb
=
x
->
sadperbit16
;
int_mv
tmp_mv
;
MV
tmp_mv
;
int
search_range
=
3
;
int
tmp_col_min
=
x
->
mv_col_min
;
...
...
@@ -2609,20 +2609,20 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
vp9_set_mv_search_range
(
x
,
&
ref_mv
[
id
].
as_mv
);
// Use mv result from single mode as mvp.
tmp_mv
.
as_int
=
frame_mv
[
refs
[
id
]].
as_
int
;
tmp_mv
=
frame_mv
[
refs
[
id
]].
as_
mv
;
tmp_mv
.
as_mv
.
col
>>=
3
;
tmp_mv
.
as_mv
.
row
>>=
3
;
tmp_mv
.
col
>>=
3
;
tmp_mv
.
row
>>=
3
;
// Small-range full-pixel motion search
bestsme
=
vp9_refining_search_8p_c
(
x
,
&
tmp_mv
.
as_mv
,
sadpb
,
bestsme
=
vp9_refining_search_8p_c
(
x
,
&
tmp_mv
,
sadpb
,
search_range
,
&
cpi
->
fn_ptr
[
bsize
],
x
->
nmvjointcost
,
x
->
mvcost
,
&
ref_mv
[
id
].
as_mv
,
second_pred
,
pw
,
ph
);
if
(
bestsme
<
INT_MAX
)
bestsme
=
vp9_get_mvpred_av_var
(
x
,
&
tmp_mv
.
as_mv
,
&
ref_mv
[
id
].
as_mv
,
bestsme
=
vp9_get_mvpred_av_var
(
x
,
&
tmp_mv
,
&
ref_mv
[
id
].
as_mv
,
second_pred
,
&
cpi
->
fn_ptr
[
bsize
],
1
);
x
->
mv_col_min
=
tmp_col_min
;
...
...
@@ -2634,7 +2634,7 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
int
dis
;
/* TODO: use dis in distortion calculation later. */
unsigned
int
sse
;
bestsme
=
cpi
->
find_fractional_mv_step_comp
(
x
,
&
tmp_mv
.
as_mv
,
x
,
&
tmp_mv
,
&
ref_mv
[
id
].
as_mv
,
cpi
->
common
.
allow_high_precision_mv
,
x
->
errorperbit
,
...
...
@@ -2649,7 +2649,7 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
xd
->
plane
[
0
].
pre
[
0
]
=
scaled_first_yv12
;
if
(
bestsme
<
last_besterr
[
id
])
{
frame_mv
[
refs
[
id
]].
as_
int
=
tmp_mv
.
as_int
;
frame_mv
[
refs
[
id
]].
as_
mv
=
tmp_mv
;
last_besterr
[
id
]
=
bestsme
;
}
else
{
break
;
...
...
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