diff options
author | Marco Paniconi <marpan@google.com> | 2018-09-04 04:07:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-04 04:07:53 +0000 |
commit | 7a32bc8f3aa888516b3d355e7e72c8e0feca098c (patch) | |
tree | 7797643b55f1f9b455656924e12b383a66796694 /vp9/encoder/vp9_svc_layercontext.c | |
parent | a8d8f37d3c2aff2412a46daf9211e1a3c0189c6a (diff) | |
parent | a2f78c7c9793292bb3793e18317e8ef920c1105e (diff) | |
download | libvpx-7a32bc8f3aa888516b3d355e7e72c8e0feca098c.tar libvpx-7a32bc8f3aa888516b3d355e7e72c8e0feca098c.tar.gz libvpx-7a32bc8f3aa888516b3d355e7e72c8e0feca098c.tar.bz2 libvpx-7a32bc8f3aa888516b3d355e7e72c8e0feca098c.zip |
Merge "vp9-svc: Add bypass flag to constrain inter_layer."
Diffstat (limited to 'vp9/encoder/vp9_svc_layercontext.c')
-rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index b0871780c..efe647611 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -1005,11 +1005,13 @@ void vp9_svc_constrain_inter_layer_pred(VP9_COMP *const cpi) { } } } - // Check for disabling inter-layer prediction if the reference for inter-layer - // prediction (the reference that is scaled) is not the previous spatial layer - // from the same superframe, then we disable inter-layer prediction. - // Only need to check when inter_layer prediction is not set to OFF mode. - if (svc->disable_inter_layer_pred != INTER_LAYER_PRED_OFF) { + // For fixed/non-flexible SVC: check for disabling inter-layer prediction. + // If the reference for inter-layer prediction (the reference that is scaled) + // is not the previous spatial layer from the same superframe, then we disable + // inter-layer prediction. Only need to check when inter_layer prediction is + // not set to OFF mode. + if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS && + svc->disable_inter_layer_pred != INTER_LAYER_PRED_OFF) { // We only use LAST and GOLDEN for prediction in real-time mode, so we // check both here. MV_REFERENCE_FRAME ref_frame; |