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

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

Browse Source 
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
parent dd6729f826
commit 55a09f7f45
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vp9/encoder/vp9_encoder.c
View File

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