Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
7279a474
Commit
7279a474
authored
Mar 28, 2016
by
Jingning Han
Committed by
Gerrit Code Review
Mar 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Rename run_rd_check to run_mv_search" into nextgenv2
parents
b5349871
59d45d60
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+14
-12
No files found.
vp10/encoder/rdopt.c
View file @
7279a474
...
...
@@ -4932,7 +4932,9 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x,
#endif // CONFIG_EXT_INTER
const
struct
buf_2d
orig_src
=
x
->
plane
[
0
].
src
;
struct
buf_2d
orig_pre
[
2
];
int
run_rd_check
=
0
;
// This flag controls if the motion estimation will kick off. When it
// is set to a non-zero value, the encoder will force motion estimation.
int
run_mv_search
=
0
;
mode_idx
=
INTER_OFFSET
(
this_mode
);
#if CONFIG_EXT_INTER
...
...
@@ -4946,7 +4948,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x,
continue
;
#if CONFIG_REF_MV
run_
rd_check
=
2
;
run_
mv_search
=
2
;
#if !CONFIG_EXT_INTER
if
(
filter_idx
>
0
)
{
BEST_SEG_INFO
*
ref_bsi
=
bsi_buf
;
...
...
@@ -4955,39 +4957,39 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x,
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
0
].
as_int
!=
INVALID_MV
)
if
(
bsi
->
ref_mv
[
0
]
->
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
pred_mv
[
0
].
as_int
)
--
run_
rd_check
;
--
run_
mv_search
;
if
(
!
has_second_rf
)
{
--
run_
rd_check
;
--
run_
mv_search
;
}
else
{
if
(
seg_mvs
[
i
][
mbmi
->
ref_frame
[
1
]].
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
1
].
as_int
&&
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
1
].
as_int
!=
INVALID_MV
)
if
(
bsi
->
ref_mv
[
1
]
->
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
pred_mv
[
1
].
as_int
)
--
run_
rd_check
;
--
run_
mv_search
;
}
if
(
run_
rd_check
!=
0
&&
filter_idx
>
1
)
{
if
(
run_
mv_search
!=
0
&&
filter_idx
>
1
)
{
ref_bsi
=
bsi_buf
+
1
;
run_
rd_check
=
2
;
run_
mv_search
=
2
;
if
(
seg_mvs
[
i
][
mbmi
->
ref_frame
[
0
]].
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
0
].
as_int
&&
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
0
].
as_int
!=
INVALID_MV
)
if
(
bsi
->
ref_mv
[
0
]
->
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
pred_mv
[
0
].
as_int
)
--
run_
rd_check
;
--
run_
mv_search
;
if
(
!
has_second_rf
)
{
--
run_
rd_check
;
--
run_
mv_search
;
}
else
{
if
(
seg_mvs
[
i
][
mbmi
->
ref_frame
[
1
]].
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
1
].
as_int
&&
ref_bsi
->
rdstat
[
i
][
mode_idx
].
mvs
[
1
].
as_int
!=
INVALID_MV
)
if
(
bsi
->
ref_mv
[
1
]
->
as_int
==
ref_bsi
->
rdstat
[
i
][
mode_idx
].
pred_mv
[
1
].
as_int
)
--
run_
rd_check
;
--
run_
mv_search
;
}
}
}
...
...
@@ -5016,7 +5018,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x,
#else
this_mode
==
NEWMV
&&
(
seg_mvs
[
i
][
mbmi
->
ref_frame
[
0
]].
as_int
==
INVALID_MV
||
run_
rd_check
)
run_
mv_search
)
#endif // CONFIG_EXT_INTER
)
{
#if CONFIG_EXT_INTER
...
...
@@ -5180,7 +5182,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP10_COMP *cpi, MACROBLOCK *x,
#else
this_mode
==
NEWMV
&&
#endif // CONFIG_EXT_INTER
(
mbmi
->
interp_filter
==
EIGHTTAP_REGULAR
||
run_
rd_check
))
{
(
mbmi
->
interp_filter
==
EIGHTTAP_REGULAR
||
run_
mv_search
))
{
// adjust src pointers
mi_buf_shift
(
x
,
i
);
if
(
cpi
->
sf
.
comp_inter_joint_search_thresh
<=
bsize
)
{
...
...
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