Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
cd1fbc67
Commit
cd1fbc67
authored
Aug 08, 2014
by
Dmitry Kovalev
Browse files
Simplifying vp9_set_speed_features() function.
Change-Id: I3e67230690b81ef54ef48ae26107fe7bc880ab8e
parent
6e5149b6
Changes
2
Show whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encoder.c
View file @
cd1fbc67
...
...
@@ -1018,10 +1018,6 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf) {
vp9_sub_pixel_avg_variance4x4
,
vp9_sad4x4x3
,
vp9_sad4x4x8
,
vp9_sad4x4x4d
)
cpi
->
full_search_sad
=
vp9_full_search_sad
;
cpi
->
diamond_search_sad
=
vp9_diamond_search_sad
;
cpi
->
refining_search_sad
=
vp9_refining_search_sad
;
/* vp9_init_quantizer() is first called here. Add check in
* vp9_frame_init_quantizer() so that vp9_init_quantizer is only
* called later when needed. This will avoid unnecessary calls of
...
...
vp9/encoder/vp9_speed_features.c
View file @
cd1fbc67
...
...
@@ -388,21 +388,19 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf
->
recode_tolerance
=
25
;
sf
->
default_interp_filter
=
SWITCHABLE
;
switch
(
oxcf
->
mode
)
{
case
ONE_PASS_BEST
:
case
TWO_PASS_SECOND_BEST
:
// This is the best quality mode.
cpi
->
diamond_search_sad
=
vp9_full_range_search
;
break
;
case
TWO_PASS_FIRST
:
case
ONE_PASS_GOOD
:
case
TWO_PASS_SECOND_GOOD
:
set_good_speed_feature
(
cpi
,
cm
,
sf
,
oxcf
->
speed
);
break
;
case
REALTIME
:
if
(
oxcf
->
mode
==
REALTIME
)
{
set_rt_speed_feature
(
cpi
,
sf
,
oxcf
->
speed
,
oxcf
->
content
);
break
;
}
else
{
if
(
!
is_best_mode
(
oxcf
->
mode
))
set_good_speed_feature
(
cpi
,
cm
,
sf
,
oxcf
->
speed
);
}
cpi
->
full_search_sad
=
vp9_full_search_sad
;
cpi
->
diamond_search_sad
=
is_best_mode
(
oxcf
->
mode
)
?
vp9_full_range_search
:
vp9_diamond_search_sad
;
cpi
->
refining_search_sad
=
vp9_refining_search_sad
;
// Slow quant, dct and trellis not worthwhile for first pass
// so make sure they are always turned off.
if
(
oxcf
->
pass
==
1
)
...
...
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