vp9-svc: For 1 pass svc, remove frame-level upsampling.

With the svc fix in https://chromium-review.googlesource.com/#/c/328978/,
the asan error is resolved, so this should work now.

Change-Id: I57b2a593651d414e1b445431d90f2fdc3281128b
This commit is contained in:
Marco 2016-01-20 14:10:26 -08:00
Родитель dd6729f826
Коммит 55a09f7f45
1 изменённых файлов: 4 добавлений и 6 удалений

Просмотреть файл

@ -3387,12 +3387,10 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
cpi->oxcf.rc_mode == VPX_VBR)) cpi->oxcf.rc_mode == VPX_VBR))
vp9_avg_source_sad(cpi); vp9_avg_source_sad(cpi);
// TODO(wonkap/marpan): For 1 pass SVC, since only ZERMOV is allowed for // For 1 pass SVC, since only ZEROMV is allowed for upsampled reference
// upsampled reference frame (i.e, svc->force_zero_mode_spatial_ref = 0), // frame (i.e, svc->force_zero_mode_spatial_ref = 0), we can avoid this
// we should be able to avoid this frame-level upsampling. // frame-level upsampling.
// Keeping it for now as there is an asan error in the multi-threaded SVC if (frame_is_intra_only(cm) == 0 && !is_one_pass_cbr_svc(cpi)) {
// rate control test if this upsampling is removed.
if (frame_is_intra_only(cm) == 0) {
vp9_scale_references(cpi); vp9_scale_references(cpi);
} }