vp9-rtc: Allow simulcast mode for flexible/bypass mode

Change-Id: I0252d06c4f21d7c700c81d387bef89646229a63c

diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index 1466d3a..cd77c08 100644 (file)
--- a/vp9/encoder/vp9_svc_layercontext.c
+++ b/vp9/encoder/vp9_svc_layercontext.c
@@ -770,9 +770,7 @@ int vp9_one_pass_cbr_svc_start_layer(VP9_COMP *const cpi) {
 
   if (svc->disable_inter_layer_pred == INTER_LAYER_PRED_OFF &&
       svc->number_spatial_layers > 1 && svc->number_spatial_layers <= 3 &&
-      svc->number_temporal_layers <= 3 &&
-      !(svc->temporal_layering_mode == VP9E_TEMPORAL_LAYERING_MODE_BYPASS &&
-        svc->use_set_ref_frame_config))
+      svc->number_temporal_layers <= 3)
     svc->simulcast_mode = 1;
   else
     svc->simulcast_mode = 0;