Karkakol/add active simulcast encodings

MembraneRTC/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.membraneframework.rtc.events.OfferData
+import org.membraneframework.rtc.events.TracksAdded
 import org.membraneframework.rtc.media.*
 import org.membraneframework.rtc.models.EncodingReason
 import org.membraneframework.rtc.models.Endpoint
@@ -49,7 +50,7 @@ internal class InternalMembraneRTC
             )
 
         private var localEndpoint: Endpoint =
-            Endpoint(id = "", type = "webrtc", metadata = mapOf(), trackIdToMetadata = mapOf())
+            Endpoint(id = "", type = "webrtc", metadata = mapOf(), trackIdToMetadata = mapOf(), tracks = mapOf())
 
         // mapping from endpoint's id to the endpoint himself
         private val remoteEndpoints = HashMap<String, Endpoint>()
@@ -249,7 +250,13 @@ internal class InternalMembraneRTC
 
                 for ((trackId, metadata) in it.trackIdToMetadata) {
                     val context =
-                        TrackContext(track = null, endpoint = it, trackId = trackId, metadata = metadata ?: mapOf())
+                        TrackContext(
+                            track = null,
+                            endpoint = it,
+                            trackId = trackId,
+                            metadata = metadata ?: mapOf(),
+                            simulcastConfig = it.tracks[trackId]?.simulcastConfig
+                        )
 
                     this.trackContexts[trackId] = context
 
@@ -375,7 +382,8 @@ internal class InternalMembraneRTC
 
         override fun onTracksAdded(
             endpointId: String,
-            trackIdToMetadata: Map<String, Metadata?>
+            trackIdToMetadata: Map<String, Metadata?>,
+            tracks: Map<String, TracksAdded.Data.TrackData>
         ) {
             if (localEndpoint.id == endpointId) return
 
@@ -385,13 +393,19 @@ internal class InternalMembraneRTC
                     return
                 }
 
-            val updatedEndpoint = endpoint.copy(trackIdToMetadata = trackIdToMetadata)
+            val updatedEndpoint = endpoint.copy(trackIdToMetadata = trackIdToMetadata, tracks = tracks)
 
             remoteEndpoints[updatedEndpoint.id] = updatedEndpoint
 
             for ((trackId, metadata) in updatedEndpoint.trackIdToMetadata) {
                 val context =
-                    TrackContext(track = null, endpoint = endpoint, trackId = trackId, metadata = metadata ?: mapOf())
+                    TrackContext(
+                        track = null,
+                        endpoint = endpoint,
+                        trackId = trackId,
+                        metadata = metadata ?: mapOf(),
+                        simulcastConfig = updatedEndpoint.tracks[trackId]?.simulcastConfig
+                    )
 
                 this.trackContexts[trackId] = context
 

MembraneRTC/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt

@@ -108,7 +108,7 @@ internal class RTCEngineCommunication
                 is EndpointRemoved -> engineListener.onEndpointRemoved(event.data.id)
                 is EndpointAdded ->
                     engineListener.onEndpointAdded(
-                        Endpoint(event.data.id, event.data.type, event.data.metadata, mapOf())
+                        Endpoint(event.data.id, event.data.type, event.data.metadata, mapOf(), mapOf())
                     )
                 is EndpointUpdated -> engineListener.onEndpointUpdated(event.data.id, event.data.metadata)
                 is RemoteCandidate ->
@@ -124,7 +124,12 @@ internal class RTCEngineCommunication
                         event.data.trackId,
                         event.data.metadata
                     )
-                is TracksAdded -> engineListener.onTracksAdded(event.data.endpointId, event.data.trackIdToMetadata)
+                is TracksAdded ->
+                    engineListener.onTracksAdded(
+                        event.data.endpointId,
+                        event.data.trackIdToMetadata,
+                        event.data.tracks
+                    )
                 is TracksRemoved -> engineListener.onTracksRemoved(event.data.endpointId, event.data.trackIds)
                 is EncodingSwitched ->
                     engineListener.onTrackEncodingChanged(

MembraneRTC/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt

@@ -1,6 +1,7 @@
 package org.membraneframework.rtc
 
 import org.membraneframework.rtc.events.OfferData
+import org.membraneframework.rtc.events.TracksAdded
 import org.membraneframework.rtc.models.Endpoint
 import org.membraneframework.rtc.utils.Metadata
 import org.membraneframework.rtc.utils.SerializedMediaEvent
@@ -41,7 +42,8 @@ internal interface RTCEngineListener {
 
     fun onTracksAdded(
         endpointId: String,
-        trackIdToMetadata: Map<String, Metadata?>
+        trackIdToMetadata: Map<String, Metadata?>,
+        tracks: Map<String, TracksAdded.Data.TrackData>
     )
 
     fun onTracksRemoved(

MembraneRTC/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt

@@ -1,14 +1,21 @@
 package org.membraneframework.rtc
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * Enum describing possible track encodings.
  * `"h"` - original encoding
  * `"m"` - original encoding scaled down by 2
  * `"l"` - original encoding scaled down by 4
  */
 enum class TrackEncoding(val rid: String) {
+    @SerializedName("l")
     L("l"),
+
+    @SerializedName("m")
     M("m"),
+
+    @SerializedName("h")
     H("h");
 
     companion object {

MembraneRTC/src/main/java/org/membraneframework/rtc/events/Event.kt

@@ -4,6 +4,7 @@ import com.google.gson.Gson
 import com.google.gson.JsonParseException
 import com.google.gson.annotations.SerializedName
 import com.google.gson.reflect.TypeToken
+import org.membraneframework.rtc.SimulcastConfig
 import org.membraneframework.rtc.models.Endpoint
 import org.membraneframework.rtc.utils.Metadata
 import org.membraneframework.rtc.utils.Payload
@@ -260,7 +261,13 @@ data class OfferData(val type: ReceivableEventType, val data: Data) : Receivable
 }
 
 data class TracksAdded(val type: ReceivableEventType, val data: Data) : ReceivableEvent() {
-    data class Data(val endpointId: String, val trackIdToMetadata: Map<String, Metadata?>)
+    data class Data(
+        val endpointId: String,
+        val trackIdToMetadata: Map<String, Metadata?>,
+        val tracks: Map<String, TrackData>
+    ) {
+        data class TrackData(val metadata: Metadata?, val simulcastConfig: SimulcastConfig?)
+    }
 }
 
 data class TracksRemoved(val type: ReceivableEventType, val data: Data) : ReceivableEvent() {

MembraneRTC/src/main/java/org/membraneframework/rtc/models/Endpoint.kt

@@ -1,12 +1,14 @@
 package org.membraneframework.rtc.models
 
+import org.membraneframework.rtc.events.TracksAdded
 import org.membraneframework.rtc.utils.Metadata
 
 data class Endpoint(
     val id: String,
     val type: String,
     val metadata: Metadata? = mapOf(),
-    val trackIdToMetadata: Map<String, Metadata?> = mapOf()
+    val trackIdToMetadata: Map<String, Metadata?> = mapOf(),
+    val tracks: Map<String, TracksAdded.Data.TrackData>
 ) {
     fun withTrack(
         trackId: String,

MembraneRTC/src/main/java/org/membraneframework/rtc/models/TrackContext.kt

@@ -1,5 +1,6 @@
 package org.membraneframework.rtc.models
 
+import org.membraneframework.rtc.SimulcastConfig
 import org.membraneframework.rtc.TrackEncoding
 import org.membraneframework.rtc.media.RemoteTrack
 import org.membraneframework.rtc.utils.Metadata
@@ -19,7 +20,13 @@ fun interface OnVoiceActivityChangedListener {
  * @property trackId Track id. It is generated by RTC engine and takes form `endpoint_id:<random_uuidv4>`.
  * @property metadata Any info that was passed in MembraneWebRTC.createVideoTrack/MembraneWebRTC.createAudioTrack
  */
-class TrackContext(track: RemoteTrack?, val endpoint: Endpoint, val trackId: String, metadata: Metadata = mapOf()) {
+class TrackContext(
+    track: RemoteTrack?,
+    val endpoint: Endpoint,
+    val trackId: String,
+    metadata: Metadata = mapOf(),
+    simulcastConfig: SimulcastConfig?
+) {
     private var onTrackEncodingChangeListener: (OnEncodingChangedListener)? = null
     private var onVadNotificationListener: (OnVoiceActivityChangedListener)? = null
 
@@ -28,6 +35,9 @@ class TrackContext(track: RemoteTrack?, val endpoint: Endpoint, val trackId: Str
     var metadata: Metadata = metadata
         internal set
 
+    var simulcastConfig: SimulcastConfig? = simulcastConfig
+        internal set
+
     var vadStatus: VadStatus = VadStatus.SILENCE
         internal set(value) {
             field = value