Explorar el Código

web,jvb: remove ENABLE_MULTISTREAM

It's not enabled by default and there is no way to disable it any
longer.

We keep setting the flags in config.js though, this is so old mobile
versions without the new default behavior can enable it.
Saúl Ibarra Corretgé hace 2 años
padre
commit
dd399fe
Se han modificado 3 ficheros con 3 adiciones y 10 borrados
  1. 0 2
      docker-compose.yml
  2. 0 4
      jvb/rootfs/defaults/jvb.conf
  3. 3 4
      web/rootfs/defaults/settings-config.js

+ 0 - 2
docker-compose.yml

@@ -88,7 +88,6 @@ services:
             - ENABLE_TRANSCRIPTIONS
             - ENABLE_XMPP_WEBSOCKET
             - ENABLE_JAAS_COMPONENTS
-            - ENABLE_MULTI_STREAM
             - ETHERPAD_PUBLIC_URL
             - ETHERPAD_URL_BASE
             - E2EPING_NUM_REQUESTS
@@ -313,7 +312,6 @@ services:
             - DOCKER_HOST_ADDRESS
             - ENABLE_COLIBRI_WEBSOCKET
             - ENABLE_OCTO
-            - ENABLE_MULTI_STREAM
             - JVB_ADVERTISE_IPS
             - JVB_ADVERTISE_PRIVATE_CANDIDATES
             - JVB_AUTH_USER

+ 0 - 4
jvb/rootfs/defaults/jvb.conf

@@ -1,7 +1,6 @@
 {{ $COLIBRI_REST_ENABLED := .Env.COLIBRI_REST_ENABLED | default "false" | toBool -}}
 {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "1" | toBool -}}
 {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool -}}
-{{ $ENABLE_MULTI_STREAM := .Env.ENABLE_MULTI_STREAM | default "true" | toBool -}}
 {{ $JVB_DISABLE_STUN := .Env.JVB_DISABLE_STUN | default "0" | toBool -}}
 {{ $JVB_STUN_SERVERS := .Env.JVB_STUN_SERVERS | default "meet-jit-si-turnrelay.jitsi.net:443" -}}
 {{ $JVB_AUTH_USER := .Env.JVB_AUTH_USER | default "jvb" -}}
@@ -65,9 +64,6 @@ videobridge {
         tls = true
         server-id = "{{ $WS_SERVER_ID }}"
     }
-    multi-stream {
-        enabled = {{ $ENABLE_MULTI_STREAM }}
-    }
     http-servers {
         private {
           host = 0.0.0.0

+ 3 - 4
web/rootfs/defaults/settings-config.js

@@ -29,7 +29,6 @@
 {{ $DISABLE_START_FOR_ALL := .Env.DISABLE_START_FOR_ALL | default "false" | toBool -}}
 {{ $AUTO_CAPTION_ON_RECORD := .Env.AUTO_CAPTION_ON_RECORD | default "false" | toBool -}}
 {{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | toBool }}
-{{ $ENABLE_MULTI_STREAM := .Env.ENABLE_MULTI_STREAM | default "true" | toBool }}
 {{ $HIDE_PREJOIN_DISPLAY_NAME := .Env.HIDE_PREJOIN_DISPLAY_NAME | default "false" | toBool -}}
 {{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}}
 {{ $RESOLUTION := .Env.RESOLUTION | default "720" -}}
@@ -84,9 +83,9 @@ config.startBitrate = '{{ .Env.START_BITRATE }}';
 {{ end -}}
 
 if (!config.hasOwnProperty('flags')) config.flags = {};
-config.flags.sourceNameSignaling = {{ $ENABLE_MULTI_STREAM }};
-config.flags.sendMultipleVideoStreams = {{ $ENABLE_MULTI_STREAM }};
-config.flags.receiveMultipleVideoStreams = {{ $ENABLE_MULTI_STREAM }};
+config.flags.sourceNameSignaling = true;
+config.flags.sendMultipleVideoStreams = true;
+config.flags.receiveMultipleVideoStreams = true;
 
 
 // ScreenShare Configuration.