Remove maxReceiverVideoConstraints (unused). (#2038)

jitsi · Aug 3, 2023 · 5fd429e · 5fd429e
1 parent 99534de
commit 5fd429e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 29 deletions.
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/AbstractEndpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/AbstractEndpoint.kt
@@ -28,7 +28,6 @@ import org.jitsi.videobridge.cc.allocation.ReceiverConstraintsMap
 import org.jitsi.videobridge.cc.allocation.VideoConstraints
 import org.json.simple.JSONObject
 import java.time.Instant
-import java.util.*
 
 /**
  * Represents an endpoint in a conference (i.e. the entity associated with
@@ -61,7 +60,7 @@ abstract class AbstractEndpoint protected constructor(
     /**
      * The map of source name -> ReceiverConstraintsMap.
      */
-    private val receiverVideoConstraints: MutableMap<String, ReceiverConstraintsMap> = HashMap()
+    private val receiverVideoConstraints = mutableMapOf<String, ReceiverConstraintsMap>()
 
     /**
      * The statistics id of this <tt>Endpoint</tt>.
@@ -81,26 +80,17 @@ abstract class AbstractEndpoint protected constructor(
     var isExpired = false
         private set
 
-    /**
-     * The maximum set of constraints applied by all receivers of this endpoint
-     * in the conference. The client needs to send _at least_ this to satisfy
-     * all receivers.
-     *
-     */
-    @Deprecated("Use maxReceiverVideoConstraintsMap.")
-    protected var maxReceiverVideoConstraints = VideoConstraints(0, 0.0)
-
     /**
      * A map of source name -> VideoConstraints.
      *
      * Stores the maximum set of constraints applied by all receivers for each media source sent by this endpoint.
      * The client needs to send _at least_ this for a media source to satisfy all its receivers.
      */
-    protected var maxReceiverVideoConstraintsMap: MutableMap<String, VideoConstraints> = HashMap()
+    protected var maxReceiverVideoConstraints = mutableMapOf<String, VideoConstraints>()
 
     protected val eventEmitter: EventEmitter<EventHandler> = SyncEventEmitter()
 
-    protected var videoTypeCache: MutableMap<String, VideoType> = HashMap()
+    private val videoTypeCache = mutableMapOf<String, VideoType>()
 
     fun hasVideoAvailable(): Boolean {
         for (source in mediaSources) {
@@ -177,12 +167,7 @@ abstract class AbstractEndpoint protected constructor(
         eventEmitter.removeHandler(eventHandler)
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    override fun toString(): String {
-        return javaClass.name + " " + id
-    }
+    override fun toString() = "${javaClass.name} $id"
 
     /**
      * Expires this [AbstractEndpoint].
@@ -224,10 +209,7 @@ abstract class AbstractEndpoint protected constructor(
      */
     abstract fun requestKeyframe()
 
-    /**
-     * A JSON representation of the parts of this object's state that
-     * are deemed useful for debugging.
-     */
+    /** A JSON representation of the parts of this object's state that are deemed useful for debugging. */
     open val debugState: JSONObject
         get() {
             val debugState = JSONObject()
@@ -236,7 +218,7 @@ abstract class AbstractEndpoint protected constructor(
                 receiverVideoConstraints[sourceName] = receiverConstraints.getDebugState()
             }
             debugState["receiverVideoConstraints"] = receiverVideoConstraints
-            debugState["maxReceiverVideoConstraintsMap"] = HashMap(maxReceiverVideoConstraintsMap)
+            debugState["maxReceiverVideoConstraints"] = HashMap(maxReceiverVideoConstraints)
             debugState["expired"] = isExpired
             debugState["statsId"] = statsId
             return debugState
@@ -251,10 +233,10 @@ abstract class AbstractEndpoint protected constructor(
      * (Currently we only support constraining the height, and not frame rate.)
      */
     private fun receiverVideoConstraintsChanged(sourceName: String, newMaxHeight: Int) {
-        val oldReceiverMaxVideoConstraints = maxReceiverVideoConstraintsMap[sourceName]
+        val oldReceiverMaxVideoConstraints = maxReceiverVideoConstraints[sourceName]
         val newReceiverMaxVideoConstraints = VideoConstraints(newMaxHeight, -1.0)
         if (newReceiverMaxVideoConstraints != oldReceiverMaxVideoConstraints) {
-            maxReceiverVideoConstraintsMap[sourceName] = newReceiverMaxVideoConstraints
+            maxReceiverVideoConstraints[sourceName] = newReceiverMaxVideoConstraints
             sendVideoConstraintsV2(sourceName, newReceiverMaxVideoConstraints)
         }
     }

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
@@ -525,7 +525,7 @@ class Endpoint @JvmOverloads constructor(
     }
 
     private fun sendAllVideoConstraints() {
-        maxReceiverVideoConstraintsMap.forEach { (sourceName, constraints) ->
+        maxReceiverVideoConstraints.forEach { (sourceName, constraints) ->
             sendVideoConstraintsV2(sourceName, constraints)
         }
     }
@@ -591,7 +591,7 @@ class Endpoint @JvmOverloads constructor(
                 logger.cdebug { "Sender constraints changed: ${senderSourceConstraintsMessage.toJson()}" }
                 sendMessage(senderSourceConstraintsMessage)
             } else {
-                maxReceiverVideoConstraintsMap[sourceName]?.let {
+                maxReceiverVideoConstraints[sourceName]?.let {
                     sendVideoConstraints(it)
                 }
                     ?: logger.error("No max receiver constraints mapping found for: $sourceName")

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/relay/RelayedEndpoint.kt
@@ -167,7 +167,7 @@ class RelayedEndpoint(
     }
 
     fun relayMessageTransportConnected() {
-        maxReceiverVideoConstraintsMap.forEach { (sourceName, constraints) ->
+        maxReceiverVideoConstraints.forEach { (sourceName, constraints) ->
             sendVideoConstraintsV2(sourceName, constraints)
         }
     }