Unified · Split
| @@ -947,8 +947,10 @@ void vp9_svc_constrain_inter_layer_pred(VP9_COMP *const cpi) { · 946 unmodified lines | |||
| 947 | void vp9_svc_assert_constraints_pattern(VP9_COMP *const cpi) { | 947 | void vp9_svc_assert_constraints_pattern(VP9_COMP *const cpi) { |
| 948 | SVC *const svc = &cpi->svc; | 948 | SVC *const svc = &cpi->svc; |
| 949 | // For fixed/non-flexible mode, and with CONSTRAINED frame drop | 949 | // For fixed/non-flexible mode, and with CONSTRAINED frame drop |
| 950 | // mode (default), the folllowing constraint are expected. | 950 | // mode (default), the folllowing constraint are expected, when |
| 951 | // inter-layer prediciton is on (default). | ||
| 951 | if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS && | 952 | if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS && |
| 953 | svc->disable_inter_layer_pred == INTER_LAYER_PRED_ON && | ||
| 952 | svc->framedrop_mode == CONSTRAINED_LAYER_DROP) { | 954 | svc->framedrop_mode == CONSTRAINED_LAYER_DROP) { |
| 953 | if (!cpi->svc.layer_context[cpi->svc.temporal_layer_id].is_key_frame) { | 955 | if (!cpi->svc.layer_context[cpi->svc.temporal_layer_id].is_key_frame) { |
| 954 | // On non-key frames: LAST is always temporal reference, GOLDEN is | 956 | // On non-key frames: LAST is always temporal reference, GOLDEN is |