[AND-18] Codec negotiation

stream-video-android-core/build.gradle.kts

@@ -194,6 +194,8 @@ dependencies {
     implementation(libs.tink)
 
     // unit tests
+    testImplementation(libs.stream.result)
+    testImplementation(libs.stream.result.call)
     testImplementation(libs.junit)
     testImplementation(libs.truth)
     testImplementation(libs.mockk)
@@ -206,6 +208,10 @@ dependencies {
     testImplementation(libs.kotlin.test.junit)
     testImplementation(libs.kotlinx.coroutines.debug)
     testImplementation(libs.kotlinx.serialization.converter)
+    testImplementation(libs.retrofit)
+    testImplementation(libs.retrofit.moshi)
+    testImplementation(libs.retrofit.scalars)
+    testImplementation(libs.retrofit.wire.converter)
 
     // instrument tests
     androidTestImplementation(libs.stream.log.android)

stream-video-android-core/src/androidTest/kotlin/io/getstream/video/android/core/AndroidDeviceTest.kt

@@ -22,8 +22,6 @@ import com.google.common.truth.Truth.assertThat
 import io.getstream.log.taggedLogger
 import io.getstream.video.android.core.api.SignalServerService
 import io.getstream.video.android.core.call.video.FilterVideoProcessor
-import io.getstream.video.android.core.events.ChangePublishQualityEvent
-import io.getstream.video.android.core.events.ParticipantJoinedEvent
 import io.getstream.video.android.core.utils.buildAudioConstraints
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runTest
@@ -41,12 +39,6 @@ import org.webrtc.RTCStats
 import org.webrtc.VideoCodecInfo
 import retrofit2.Retrofit
 import retrofit2.converter.wire.WireConverterFactory
-import stream.video.sfu.event.ChangePublishQuality
-import stream.video.sfu.event.VideoLayerSetting
-import stream.video.sfu.event.VideoMediaRequest
-import stream.video.sfu.event.VideoSender
-import stream.video.sfu.models.Participant
-import stream.video.sfu.models.TrackType
 import stream.video.sfu.signal.UpdateMuteStatesRequest
 import java.io.IOException
 import java.io.InterruptedIOException
@@ -525,79 +517,4 @@ class AndroidDeviceTest : IntegrationTestBase(connectCoordinatorWS = false) {
         // clean up a call
         call.cleanup()
     }
-
-    @Test
-    fun dynascale() = runTest {
-        // join will automatically start the audio and video capture
-        // based on the call settings
-        val joinResult = call.join(create = true)
-        assertSuccess(joinResult)
-
-        // create a turbine connection state
-        val connectionState = call.state.connection.testIn(backgroundScope)
-        // asset that the connection state is connected
-        val connectionStateItem = connectionState.awaitItem()
-        assertThat(connectionStateItem).isAnyOf(
-            RealtimeConnection.Connected,
-            RealtimeConnection.Joined(joinResult.getOrThrow()),
-        )
-        if (connectionStateItem is RealtimeConnection.Joined) {
-            connectionState.awaitItem()
-        }
-
-        // fake a participant joining
-        val joinEvent = ParticipantJoinedEvent(
-            callCid = call.cid,
-            participant = Participant(session_id = "fake", user_id = "fake"),
-        )
-        clientImpl.fireEvent(joinEvent, call.cid)
-
-        val participantsState = call.state.participants.testIn(backgroundScope)
-        val participants = participantsState.awaitItem()
-        assertThat(participants.size).isEqualTo(2)
-
-        val remoteParticipants = call.state.remoteParticipants.testIn(backgroundScope)
-        assertThat(remoteParticipants.awaitItem().size).isEqualTo(1)
-
-        val sortedParticipants = call.state.sortedParticipants.testIn(backgroundScope)
-        assertThat(sortedParticipants.awaitItem().size).isEqualTo(2)
-
-        // set their video as visible
-        call.setVisibility(sessionId = "fake", TrackType.TRACK_TYPE_VIDEO, true)
-        call.setVisibility(sessionId = "fake", TrackType.TRACK_TYPE_SCREEN_SHARE, true)
-
-//        val tracks1 = call.session?.defaultTracks()
-//        val tracks2 = call.session?.visibleTracks()
-//
-//        assertThat(tracks1?.size).isEqualTo(2)
-//        assertThat(tracks1?.map { it.session_id }).contains("fake")
-//        assertThat(tracks2?.size).isEqualTo(2)
-//        assertThat(tracks2?.map { it.session_id }).contains("fake")
-//
-//        // if their video isn't visible it shouldn't be in the tracks
-//        call.setVisibility(sessionId = "fake", TrackType.TRACK_TYPE_VIDEO, false)
-//        val tracks3 = call.session?.visibleTracks()
-//        assertThat(tracks3?.size).isEqualTo(1)
-
-        // test handling publish quality change
-        val mediaRequest = VideoMediaRequest()
-        val layers = listOf(
-            VideoLayerSetting(name = "f", active = false),
-            VideoLayerSetting(name = "h", active = true),
-            VideoLayerSetting(name = "q", active = false),
-        )
-        val quality = ChangePublishQuality(
-            video_senders = listOf(
-                VideoSender(
-                    media_request = mediaRequest,
-                    layers = layers,
-                ),
-            ),
-        )
-        val event = ChangePublishQualityEvent(changePublishQuality = quality)
-        call.session?.updatePublishQuality(event)
-
-        // clean up a call
-        call.cleanup()
-    }
 }

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/Call.kt

@@ -140,7 +140,7 @@ public class Call(
     private var callStatsReportingJob: Job? = null
     private var powerManager: PowerManager? = null
 
-    private val scope = CoroutineScope(clientImpl.scope.coroutineContext + supervisorJob)
+    internal val scope = CoroutineScope(clientImpl.scope.coroutineContext + supervisorJob)
 
     /** The call state contains all state such as the participant list, reactions etc */
     val state = CallState(client, this, user, scope)
@@ -661,6 +661,7 @@ public class Call(
                 // switch to the new SFU
                 val cred = joinResponse.value.credentials
                 val session = this.session!!
+                val currentOptions = this.session?.publisher?.currentOptions()
                 logger.i { "Rejoin SFU ${session?.sfuUrl} to ${cred.server.url}" }
 
                 this.sessionId = UUID.randomUUID().toString()
@@ -688,7 +689,7 @@ public class Call(
                         ice.toIceServer()
                     },
                 )
-                this.session?.connect(reconnectDetails)
+                this.session?.connect(reconnectDetails, currentOptions)
                 session.cleanup()
                 monitorSession(joinResponse.value)
             } else {
@@ -714,6 +715,7 @@ public class Call(
                 // switch to the new SFU
                 val cred = joinResponse.value.credentials
                 val session = this.session!!
+                val currentOptions = this.session?.publisher?.currentOptions()
                 val oldSfuUrl = session.sfuUrl
                 logger.i { "Rejoin SFU $oldSfuUrl to ${cred.server.url}" }
 
@@ -744,7 +746,7 @@ public class Call(
                 )
                 val oldSession = this.session
                 this.session = newSession
-                this.session?.connect(reconnectDetails)
+                this.session?.connect(reconnectDetails, currentOptions)
                 monitorSession(joinResponse.value)
                 oldSession?.leaveWithReason("migrating")
                 oldSession?.cleanup()
@@ -1384,7 +1386,7 @@ public class Call(
 
         fun fastReconnect() {
             call.scope.launch {
-                call.rejoin()
+                call.fastReconnect()
             }
         }
     }

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/MediaManager.kt

@@ -844,27 +844,24 @@ class MediaManagerImpl(
     val videoSource =
         call.peerConnectionFactory.makeVideoSource(false, filterVideoProcessor)
 
-    val screenShareVideoSource by lazy {
+    val screenShareVideoSource =
         call.peerConnectionFactory.makeVideoSource(true, screenShareFilterVideoProcessor)
-    }
 
     // for track ids we emulate the browser behaviour of random UUIDs, doing something different would be confusing
-    val videoTrack = call.peerConnectionFactory.makeVideoTrack(
+    var videoTrack = call.peerConnectionFactory.makeVideoTrack(
         source = videoSource,
         trackId = UUID.randomUUID().toString(),
     )
 
-    val screenShareTrack by lazy {
-        call.peerConnectionFactory.makeVideoTrack(
-            source = screenShareVideoSource,
-            trackId = UUID.randomUUID().toString(),
-        )
-    }
+    var screenShareTrack = call.peerConnectionFactory.makeVideoTrack(
+        source = screenShareVideoSource,
+        trackId = UUID.randomUUID().toString(),
+    )
 
     val audioSource = call.peerConnectionFactory.makeAudioSource(buildAudioConstraints())
 
     // for track ids we emulate the browser behaviour of random UUIDs, doing something different would be confusing
-    val audioTrack = call.peerConnectionFactory.makeAudioTrack(
+    var audioTrack = call.peerConnectionFactory.makeAudioTrack(
         source = audioSource,
         trackId = UUID.randomUUID().toString(),
     )