generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "seeing a 10x slowing down, revert now for investigation"

Browse Source
This commit is contained in:
Yaowu Xu
2014-06-02 09:02:32 -07:00
committed by Gerrit Code Review
parent c40a968e13 dbfc3692eb
commit f13c99562c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vp9/encoder/vp9_encoder.c
View File

@@ -486,11 +486,15 @@ static void update_frame_size(VP9_COMP *cpi) {
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR, vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to reallocate scaled last source buffer"); "Failed to reallocate scaled last source buffer");
set_speed_features(cpi); {
if (cpi->sf.search_method == NSTEP) int y_stride = cpi->scaled_source.y_stride;
vp9_init3smotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride);
else if (cpi->sf.search_method == DIAMOND) if (cpi->sf.search_method == NSTEP) {
vp9_init_dsmotion_compensation(&cpi->ss_cfg, cpi->scaled_source.y_stride); 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); init_macroblockd(cm, xd);
} }