fool proof coroutinesdpobserver a little better

@@ -5,7 +5,7 @@ import com.github.ajalt.timberkt.Timber
 import io.livekit.android.dagger.InjectionNames
 import io.livekit.android.dagger.InjectionNames
 import io.livekit.android.room.track.Track
 import io.livekit.android.room.track.Track
 import io.livekit.android.room.track.TrackException
 import io.livekit.android.room.track.TrackException
-import io.livekit.android.room.util.CoroutineSdpObserver
+import io.livekit.android.room.util.*
 import io.livekit.android.util.CloseableCoroutineScope
 import io.livekit.android.util.CloseableCoroutineScope
 import io.livekit.android.util.Either
 import io.livekit.android.util.Either
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
@@ -101,9 +101,8 @@ constructor(
             return
             return
         }
         }
         coroutineScope.launch {
         coroutineScope.launch {
-            val offerObserver = CoroutineSdpObserver()
-            publisher.peerConnection.createOffer(offerObserver, OFFER_CONSTRAINTS)
-            val sdpOffer = when (val outcome = offerObserver.awaitCreate()) {
+            val sdpOffer =
+                when (val outcome = publisher.peerConnection.createOffer(OFFER_CONSTRAINTS)) {
                     is Either.Left -> outcome.value
                     is Either.Left -> outcome.value
                     is Either.Right -> {
                     is Either.Right -> {
                         Timber.d { "error creating offer: ${outcome.value}" }
                         Timber.d { "error creating offer: ${outcome.value}" }
@@ -111,13 +110,15 @@ constructor(
                     }
                     }
                 }
                 }
 
 
-            val setObserver = CoroutineSdpObserver()
-            publisher.peerConnection.setLocalDescription(setObserver, sdpOffer)
-            when (val outcome = setObserver.awaitSet()) {
-                is Either.Left -> client.sendOffer(sdpOffer)
-                is Either.Right -> Timber.d { "error setting local description: ${outcome.value}" }
+            when (val outcome = publisher.peerConnection.setLocalDescription(sdpOffer)) {
+                is Either.Right -> {
+                    Timber.d { "error setting local description: ${outcome.value}" }
+                    return@launch
                 }
                 }
             }
             }
+
+            client.sendOffer(sdpOffer)
+        }
     }
     }
 
 
     private fun onRTCConnected() {
     private fun onRTCConnected() {
@@ -163,9 +164,8 @@ constructor(
         joinResponse = info
         joinResponse = info
 
 
         coroutineScope.launch {
         coroutineScope.launch {
-            val offerObserver = CoroutineSdpObserver()
-            publisher.peerConnection.createOffer(offerObserver, OFFER_CONSTRAINTS)
-            val sdpOffer = when (val outcome = offerObserver.awaitCreate()) {
+            val sdpOffer =
+                when (val outcome = publisher.peerConnection.createOffer(OFFER_CONSTRAINTS)) {
                     is Either.Left -> outcome.value
                     is Either.Left -> outcome.value
                     is Either.Right -> {
                     is Either.Right -> {
                         Timber.d { "error creating offer: ${outcome.value}" }
                         Timber.d { "error creating offer: ${outcome.value}" }
@@ -173,21 +173,20 @@ constructor(
                     }
                     }
                 }
                 }
 
 
-            val setObserver = CoroutineSdpObserver()
-            publisher.peerConnection.setLocalDescription(setObserver, sdpOffer)
-            when (val outcome = setObserver.awaitSet()) {
-                is Either.Left -> client.sendOffer(sdpOffer)
-                is Either.Right -> Timber.d { "error setting local description: ${outcome.value}" }
+            when (val outcome = publisher.peerConnection.setLocalDescription(sdpOffer)) {
+                is Either.Right -> {
+                    Timber.d { "error setting local description: ${outcome.value}" }
+                }
             }
             }
+
+            client.sendOffer(sdpOffer)
         }
         }
     }
     }
 
 
     override fun onAnswer(sessionDescription: SessionDescription) {
     override fun onAnswer(sessionDescription: SessionDescription) {
         Timber.v { "received server answer: ${sessionDescription.type}, ${publisher.peerConnection.signalingState()}" }
         Timber.v { "received server answer: ${sessionDescription.type}, ${publisher.peerConnection.signalingState()}" }
-        val observer = CoroutineSdpObserver()
-        publisher.peerConnection.setRemoteDescription(observer, sessionDescription)
         coroutineScope.launch {
         coroutineScope.launch {
-            when (val outcome = observer.awaitSet()) {
+            when (val outcome = publisher.peerConnection.setRemoteDescription(sessionDescription)) {
                 is Either.Left -> {
                 is Either.Left -> {
                     if (!rtcConnected) {
                     if (!rtcConnected) {
                         onRTCConnected()
                         onRTCConnected()
@@ -204,9 +203,8 @@ constructor(
         Timber.v { "received server offer: ${sessionDescription.type}, ${subscriber.peerConnection.signalingState()}" }
         Timber.v { "received server offer: ${sessionDescription.type}, ${subscriber.peerConnection.signalingState()}" }
         coroutineScope.launch {
         coroutineScope.launch {
             run<Unit> {
             run<Unit> {
-                val observer = CoroutineSdpObserver()
-                subscriber.peerConnection.setRemoteDescription(observer, sessionDescription)
-                when (val outcome = observer.awaitSet()) {
+                when (val outcome =
+                    subscriber.peerConnection.setRemoteDescription(sessionDescription)) {
                     is Either.Right -> {
                     is Either.Right -> {
                         Timber.e { "error setting remote description for answer: ${outcome.value} " }
                         Timber.e { "error setting remote description for answer: ${outcome.value} " }
                         return@launch
                         return@launch
@@ -215,9 +213,7 @@ constructor(
             }
             }
 
 
             val answer = run {
             val answer = run {
-                val observer = CoroutineSdpObserver()
-                subscriber.peerConnection.createAnswer(observer, OFFER_CONSTRAINTS)
-                when (val outcome = observer.awaitCreate()) {
+                when (val outcome = subscriber.peerConnection.createAnswer(OFFER_CONSTRAINTS)) {
                     is Either.Left -> outcome.value
                     is Either.Left -> outcome.value
                     is Either.Right -> {
                     is Either.Right -> {
                         Timber.e { "error creating answer: ${outcome.value}" }
                         Timber.e { "error creating answer: ${outcome.value}" }
@@ -227,9 +223,7 @@ constructor(
             }
             }
 
 
             run<Unit> {
             run<Unit> {
-                val observer = CoroutineSdpObserver()
-                subscriber.peerConnection.setLocalDescription(observer, answer)
-                when (val outcome = observer.awaitSet()) {
+                when (val outcome = subscriber.peerConnection.setLocalDescription(answer)) {
                     is Either.Right -> {
                     is Either.Right -> {
                         Timber.e { "error setting local description for answer: ${outcome.value}" }
                         Timber.e { "error setting local description for answer: ${outcome.value}" }
                         return@launch
                         return@launch

 package io.livekit.android.room.util
 package io.livekit.android.room.util
 
 
 import io.livekit.android.util.Either
 import io.livekit.android.util.Either
+import org.webrtc.MediaConstraints
+import org.webrtc.PeerConnection
 import org.webrtc.SdpObserver
 import org.webrtc.SdpObserver
 import org.webrtc.SessionDescription
 import org.webrtc.SessionDescription
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.Continuation
@@ -72,3 +74,27 @@ class CoroutineSdpObserver : SdpObserver {
         }
         }
     }
     }
 }
 }
+
+suspend fun PeerConnection.createOffer(constraints: MediaConstraints): Either<SessionDescription, String?> {
+    val observer = CoroutineSdpObserver()
+    this.createOffer(observer, constraints)
+    return observer.awaitCreate()
+}
+
+suspend fun PeerConnection.createAnswer(constraints: MediaConstraints): Either<SessionDescription, String?> {
+    val observer = CoroutineSdpObserver()
+    this.createAnswer(observer, constraints)
+    return observer.awaitCreate()
+}
+
+suspend fun PeerConnection.setRemoteDescription(description: SessionDescription): Either<Unit, String?> {
+    val observer = CoroutineSdpObserver()
+    this.setRemoteDescription(observer, description)
+    return observer.awaitSet()
+}
+
+suspend fun PeerConnection.setLocalDescription(description: SessionDescription): Either<Unit, String?> {
+    val observer = CoroutineSdpObserver()
+    this.setLocalDescription(observer, description)
+    return observer.awaitSet()
+}

@@ -14,7 +14,6 @@ import kotlinx.parcelize.Parcelize
 class CallActivity : AppCompatActivity() {
 class CallActivity : AppCompatActivity() {
 
 
     val viewModel: CallViewModel by viewModelByFactory {
     val viewModel: CallViewModel by viewModelByFactory {
-
         val args = intent.getParcelableExtra<BundleArgs>(KEY_ARGS)
         val args = intent.getParcelableExtra<BundleArgs>(KEY_ARGS)
             ?: throw NullPointerException("args is null!")
             ?: throw NullPointerException("args is null!")
         CallViewModel(args.url, args.token, application)
         CallViewModel(args.url, args.token, application)

@@ -10,8 +10,6 @@ import io.livekit.android.room.track.RemoteVideoTrackPublication
 import io.livekit.android.room.track.VideoTrack
 import io.livekit.android.room.track.VideoTrack
 import io.livekit.android.room.track.VideoTrackPublication
 import io.livekit.android.room.track.VideoTrackPublication
 import io.livekit.android.sample.databinding.ParticipantItemBinding
 import io.livekit.android.sample.databinding.ParticipantItemBinding
-import org.webrtc.VideoFrame
-import org.webrtc.VideoSink
 
 
 class ParticipantItem(
 class ParticipantItem(
     val room: Room,
     val room: Room,
@@ -63,12 +61,6 @@ class ParticipantItem(
 
 
         videoBound = true
         videoBound = true
         Timber.v { "adding renderer to $videoTrack" }
         Timber.v { "adding renderer to $videoTrack" }
-        videoTrack.addRenderer(object : VideoSink {
-            override fun onFrame(frame: VideoFrame?) {
-                Timber.v { "$frame" }
-            }
-
-        })
         videoTrack.addRenderer(viewBinding.renderer)
         videoTrack.addRenderer(viewBinding.renderer)
     }
     }