Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
6673d2f3
Commit
6673d2f3
authored
Jul 11, 2014
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove an unused parameter in vp9_init_search_range()
Change-Id: I3d9130e726a1299fd258f6dfe93315e2d12f76da
parent
a75d55df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+2
-2
vp9/encoder/vp9_mcomp.c
vp9/encoder/vp9_mcomp.c
+1
-2
vp9/encoder/vp9_mcomp.h
vp9/encoder/vp9_mcomp.h
+1
-1
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+2
-2
No files found.
vp9/encoder/vp9_encoder.c
View file @
6673d2f3
...
...
@@ -2096,7 +2096,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
cm
->
lf
.
mode_ref_delta_update
=
0
;
// Initialize cpi->mv_step_param to default based on max resolution.
cpi
->
mv_step_param
=
vp9_init_search_range
(
sf
,
max_mv_def
);
cpi
->
mv_step_param
=
vp9_init_search_range
(
max_mv_def
);
// Initialize cpi->max_mv_magnitude and cpi->mv_step_param if appropriate.
if
(
sf
->
mv
.
auto_mv_step_size
)
{
if
(
frame_is_intra_only
(
cm
))
{
...
...
@@ -2108,7 +2108,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
// Allow mv_steps to correspond to twice the max mv magnitude found
// in the previous frame, capped by the default max_mv_magnitude based
// on resolution.
cpi
->
mv_step_param
=
vp9_init_search_range
(
sf
,
MIN
(
max_mv_def
,
2
*
cpi
->
mv_step_param
=
vp9_init_search_range
(
MIN
(
max_mv_def
,
2
*
cpi
->
max_mv_magnitude
));
cpi
->
max_mv_magnitude
=
0
;
}
...
...
vp9/encoder/vp9_mcomp.c
View file @
6673d2f3
...
...
@@ -51,9 +51,8 @@ void vp9_set_mv_search_range(MACROBLOCK *x, const MV *mv) {
x
->
mv_row_max
=
row_max
;
}
int
vp9_init_search_range
(
const
SPEED_FEATURES
*
sf
,
int
size
)
{
int
vp9_init_search_range
(
int
size
)
{
int
sr
=
0
;
// Minimum search size no matter what the passed in value.
size
=
MAX
(
16
,
size
);
...
...
vp9/encoder/vp9_mcomp.h
View file @
6673d2f3
...
...
@@ -64,7 +64,7 @@ int vp9_get_mvpred_av_var(const MACROBLOCK *x,
struct
VP9_COMP
;
struct
SPEED_FEATURES
;
int
vp9_init_search_range
(
const
struct
SPEED_FEATURES
*
sf
,
int
size
);
int
vp9_init_search_range
(
int
size
);
// Runs sequence of diamond searches in smaller steps for RD
int
vp9_full_pixel_diamond
(
const
struct
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
...
...
vp9/encoder/vp9_rdopt.c
View file @
6673d2f3
...
...
@@ -1367,7 +1367,7 @@ static int64_t rd_pick_best_sub8x8_mode(VP9_COMP *cpi, MACROBLOCK *x,
// Take wtd average of the step_params based on the last frame's
// max mv magnitude and the best ref mvs of the current block for
// the given reference.
step_param
=
(
vp9_init_search_range
(
&
cpi
->
sf
,
max_mv
)
+
step_param
=
(
vp9_init_search_range
(
max_mv
)
+
cpi
->
mv_step_param
)
/
2
;
}
else
{
step_param
=
cpi
->
mv_step_param
;
...
...
@@ -1779,7 +1779,7 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
// Take wtd average of the step_params based on the last frame's
// max mv magnitude and that based on the best ref mvs of the current
// block for the given reference.
step_param
=
(
vp9_init_search_range
(
&
cpi
->
sf
,
x
->
max_mv_context
[
ref
])
+
step_param
=
(
vp9_init_search_range
(
x
->
max_mv_context
[
ref
])
+
cpi
->
mv_step_param
)
/
2
;
}
else
{
step_param
=
cpi
->
mv_step_param
;
...
...
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