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

vp9: 1 pass SVC: Fix comment and condition for up-sampling reference.

Browse Source 
No change in behavior.

Change-Id: I218fb30289091da623acb23324027435b8510d0e
This commit is contained in:
Marco 2017-04-20 14:13:57 -07:00
parent 30ef50b522
commit 29938b3a5a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vp9/encoder/vp9_encoder.c
View File

@ -3229,10 +3229,11 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
cpi->oxcf.content == VP9E_CONTENT_SCREEN)) cpi->oxcf.content == VP9E_CONTENT_SCREEN))
vp9_scene_detection_onepass(cpi); vp9_scene_detection_onepass(cpi);
// For 1 pass SVC, since only ZEROMV is allowed for upsampled reference // For 1 pass CBR SVC, only ZEROMV is allowed for spatial reference frame
// frame (i.e, svc->force_zero_mode_spatial_ref = 0), we can avoid this // when svc->force_zero_mode_spatial_ref = 1. Under those conditions we can
// frame-level upsampling. // avoid this frame-level upsampling (for non intra_only frames).
if (frame_is_intra_only(cm) == 0 && !is_one_pass_cbr_svc(cpi)) { if (frame_is_intra_only(cm) == 0 &&
!(is_one_pass_cbr_svc(cpi) && cpi->svc.force_zero_mode_spatial_ref)) {
vp9_scale_references(cpi); vp9_scale_references(cpi);
} }