summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Paniconi <marpan@google.com>2020-04-24 10:07:02 -0700
committerMarco Paniconi <marpan@google.com>2020-04-24 10:11:39 -0700
commitea0734cc908b01f4581e276be250da84c5a7019c (patch)
tree1eba8ba70702583d950a9221b36401d3c7240e4e
parent742dbe2a6ae83d01deafa2eea0e838418a8c6d37 (diff)
downloadlibvpx-ea0734cc908b01f4581e276be250da84c5a7019c.tar
libvpx-ea0734cc908b01f4581e276be250da84c5a7019c.tar.gz
libvpx-ea0734cc908b01f4581e276be250da84c5a7019c.tar.bz2
libvpx-ea0734cc908b01f4581e276be250da84c5a7019c.zip
vp9-rtc: Allow simulcast mode for flexible/bypass mode
Change-Id: I0252d06c4f21d7c700c81d387bef89646229a63c
-rw-r--r--vp9/encoder/vp9_svc_layercontext.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c
index 1466d3a2b..cd77c08a8 100644
--- 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;