History

Merge "vp9-svc: Add conditon to asserts on prediction pattern."

Marco Paniconi committed 8 years ago

Commit dc262df2 parents 66aca16 50867161 file · +3 −1Browse files

Unified · Split

vp9/encoder/vp9_svc_layercontext.c+3−1
@@ -947,8 +947,10 @@ void vp9_svc_constrain_inter_layer_pred(VP9_COMP *const cpi) { · 946 unmodified lines
947947 void vp9_svc_assert_constraints_pattern(VP9_COMP *const cpi) {
948948 SVC *const svc = &cpi->svc;
949949 // 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).
951952 if (svc->temporal_layering_mode != VP9E_TEMPORAL_LAYERING_MODE_BYPASS &&
953+ svc->disable_inter_layer_pred == INTER_LAYER_PRED_ON &&
952954 svc->framedrop_mode == CONSTRAINED_LAYER_DROP) {
953955 if (!cpi->svc.layer_context[cpi->svc.temporal_layer_id].is_key_frame) {
954956 // On non-key frames: LAST is always temporal reference, GOLDEN is

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t