diff options
| author | Marco Paniconi <marpan@google.com> | 2018-05-14 18:13:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-14 18:13:59 +0000 |
| commit | dc262df7b5828b079f7e15cd7dbb296b7c281de8 (patch) | |
| tree | 6b82cc89e52e8b55ca125d7107365d6ec6d4dfb2 | |
| parent | 66aca163f5017fc50276f1c3025f2b2cc08aa010 (diff) | |
| parent | 5086716a17bb9f2fac0b0d3af8329dc57e23489b (diff) | |
| download | libvpx-dc262df7b5828b079f7e15cd7dbb296b7c281de8.tar libvpx-dc262df7b5828b079f7e15cd7dbb296b7c281de8.tar.gz libvpx-dc262df7b5828b079f7e15cd7dbb296b7c281de8.tar.bz2 libvpx-dc262df7b5828b079f7e15cd7dbb296b7c281de8.zip | |
Merge "vp9-svc: Add conditon to asserts on prediction pattern."
| -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 |