allow muting via setting the direction a channel (#1179)

* allow muting via setting the direction a channel supported for audio only, currently * update JMT version
jitsi · Apr 8, 2020 · 4cf3ce1 · 4cf3ce1
1 parent a31bd71
commit 4cf3ce1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-media-transform</artifactId>
-      <version>1.0-139-g33e0a49</version>
+      <version>1.0-142-g94e1c26</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/src/main/java/org/jitsi/videobridge/Endpoint.java b/src/main/java/org/jitsi/videobridge/Endpoint.java
@@ -1463,6 +1463,27 @@ public void updateAcceptedMediaTypes()
         this.acceptVideo = acceptVideo;
     }
 
+    public void updateForceMute()
+    {
+        boolean audioForcedMuted = false;
+        for (ChannelShim channelShim : channelShims)
+        {
+            if (!channelShim.allowIncomingMedia())
+            {
+                switch (channelShim.getMediaType())
+                {
+                    case AUDIO:
+                        audioForcedMuted = true;
+                        break;
+                    case VIDEO:
+                        logger.warn(() -> "Tried to mute the incoming video stream, but that is not currently supported");
+                        break;
+                }
+            }
+        }
+        transceiver.forceMuteAudio(audioForcedMuted);
+    }
+
     /**
      * @return this {@link Endpoint}'s transceiver.
      */

diff --git a/src/main/java/org/jitsi/videobridge/shim/ChannelShim.java b/src/main/java/org/jitsi/videobridge/shim/ChannelShim.java
@@ -382,6 +382,19 @@ public boolean allowsSendingMedia()
             "sendonly".equalsIgnoreCase(direction);
     }
 
+    /**
+     * Checks if incoming media (from the endpoint to the bridge) is being
+     * forcibly "muted"
+     * @return true if media for this channel is allowed, false if it should
+     * be forcibly "muted" (dropped)
+     */
+    public boolean allowIncomingMedia()
+    {
+        return "sendrecv".equalsIgnoreCase(direction) ||
+            "recvonly".equalsIgnoreCase(direction);
+
+    }
+
     /**
      * Sets the media direction of this channel.
      * @param direction the direction to set.
@@ -392,6 +405,7 @@ public void setDirection(String direction)
         {
             this.direction = direction;
             this.endpoint.updateAcceptedMediaTypes();
+            this.endpoint.updateForceMute();
         }
     }