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
a61973bf
Commit
a61973bf
authored
Sep 08, 2014
by
Jingning Han
Committed by
Gerrit Code Review
Sep 08, 2014
Browse files
Merge "Enable adaptive motion search for ARF coding"
parents
bb4f2ebc
d435148f
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rd.c
View file @
a61973bf
...
...
@@ -374,7 +374,6 @@ void vp9_mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
uint8_t
*
ref_y_ptr
;
const
int
num_mv_refs
=
MAX_MV_REF_CANDIDATES
+
(
cpi
->
sf
.
adaptive_motion_search
&&
cpi
->
common
.
show_frame
&&
block_size
<
cpi
->
sf
.
max_partition_size
);
MV
pred_mv
[
3
];
...
...
vp9/encoder/vp9_rdopt.c
View file @
a61973bf
...
...
@@ -1398,7 +1398,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x,
mvp_full
.
row
=
bsi
->
mvp
.
as_mv
.
row
>>
3
;
mvp_full
.
col
=
bsi
->
mvp
.
as_mv
.
col
>>
3
;
if
(
cpi
->
sf
.
adaptive_motion_search
&&
cm
->
show_frame
)
{
if
(
cpi
->
sf
.
adaptive_motion_search
)
{
mvp_full
.
row
=
x
->
pred_mv
[
mbmi
->
ref_frame
[
0
]].
row
>>
3
;
mvp_full
.
col
=
x
->
pred_mv
[
mbmi
->
ref_frame
[
0
]].
col
>>
3
;
step_param
=
MAX
(
step_param
,
8
);
...
...
@@ -1815,8 +1815,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
step_param
=
cpi
->
mv_step_param
;
}
if
(
cpi
->
sf
.
adaptive_motion_search
&&
bsize
<
BLOCK_64X64
&&
cm
->
show_frame
)
{
if
(
cpi
->
sf
.
adaptive_motion_search
&&
bsize
<
BLOCK_64X64
)
{
int
boffset
=
2
*
(
b_width_log2
(
BLOCK_64X64
)
-
MIN
(
b_height_log2
(
bsize
),
b_width_log2
(
bsize
)));
step_param
=
MAX
(
step_param
,
boffset
);
...
...
@@ -1876,7 +1875,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
*
rate_mv
=
vp9_mv_bit_cost
(
&
tmp_mv
->
as_mv
,
&
ref_mv
,
x
->
nmvjointcost
,
x
->
mvcost
,
MV_COST_WEIGHT
);
if
(
cpi
->
sf
.
adaptive_motion_search
&&
cm
->
show_frame
)
if
(
cpi
->
sf
.
adaptive_motion_search
)
x
->
pred_mv
[
ref
]
=
tmp_mv
->
as_mv
;
if
(
scaled_ref_frame
)
{
...
...
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