diff options
| author | Marco Paniconi <marpan@google.com> | 2018-05-14 09:55:14 -0700 |
|---|---|---|
| committer | Marco Paniconi <marpan@google.com> | 2018-05-14 09:57:00 -0700 |
| commit | 5086716a17bb9f2fac0b0d3af8329dc57e23489b (patch) | |
| tree | c3d55210d3cabc7ad4d0bc68ccc259587fb0e492 /vp9 | |
| parent | c85c5337bfe2f64503b8e8f4584db63d6cd64d61 (diff) | |
| download | libvpx-5086716a17bb9f2fac0b0d3af8329dc57e23489b.tar libvpx-5086716a17bb9f2fac0b0d3af8329dc57e23489b.tar.gz libvpx-5086716a17bb9f2fac0b0d3af8329dc57e23489b.tar.bz2 libvpx-5086716a17bb9f2fac0b0d3af8329dc57e23489b.zip | |
vp9-svc: Add conditon to asserts on prediction pattern.
Add condition that inter-layer prediction is on.
Change-Id: I84d8c73be4296e7b6b79abb7e5e5e6dbaa6e0600
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index aec877ac8..00c766b54 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -947,8 +947,10 @@ void vp9_svc_constrain_inter_layer_pred(VP9_COMP *const cpi) { void vp9_svc_assert_constraints_pattern(VP9_COMP *const cpi) { SVC *const svc = &cpi->svc; // For fixed/non-flexible mode, and with CONSTRAINED frame drop - // mode (default), the folllowing constraint are expected. + // mode (default), the folllowing constraint are expected, when + // inter-layer prediciton is on (default). if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS && + svc->disable_inter_layer_pred == INTER_LAYER_PRED_ON && svc->framedrop_mode == CONSTRAINED_LAYER_DROP) { if (!cpi->svc.layer_context[cpi->svc.temporal_layer_id].is_key_frame) { // On non-key frames: LAST is always temporal reference, GOLDEN is |