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
f13c9956
Commit
f13c9956
authored
Jun 02, 2014
by
Yaowu Xu
Committed by
Gerrit Code Review
Jun 02, 2014
Browse files
Merge "seeing a 10x slowing down, revert now for investigation"
parents
c40a968e
dbfc3692
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encoder.c
View file @
f13c9956
...
...
@@ -486,11 +486,15 @@ static void update_frame_size(VP9_COMP *cpi) {
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to reallocate scaled last source buffer"
);
set_speed_features
(
cpi
);
if
(
cpi
->
sf
.
search_method
==
NSTEP
)
vp9_init3smotion_compensation
(
&
cpi
->
ss_cfg
,
cpi
->
scaled_source
.
y_stride
);
else
if
(
cpi
->
sf
.
search_method
==
DIAMOND
)
vp9_init_dsmotion_compensation
(
&
cpi
->
ss_cfg
,
cpi
->
scaled_source
.
y_stride
);
{
int
y_stride
=
cpi
->
scaled_source
.
y_stride
;
if
(
cpi
->
sf
.
search_method
==
NSTEP
)
{
vp9_init3smotion_compensation
(
&
cpi
->
ss_cfg
,
y_stride
);
}
else
if
(
cpi
->
sf
.
search_method
==
DIAMOND
)
{
vp9_init_dsmotion_compensation
(
&
cpi
->
ss_cfg
,
y_stride
);
}
}
init_macroblockd
(
cm
,
xd
);
}
...
...
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