Fix switch camera side not working (#67)

* Add switch camera feat * Fix switching camera
shepeliev · Aug 17, 2022 · 71cb101 · 71cb101
1 parent 224415b
commit 71cb101
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/sample/app-android/src/main/java/com/shepeliev/webrtckmp/sample/VideoScreen.kt b/sample/app-android/src/main/java/com/shepeliev/webrtckmp/sample/VideoScreen.kt
@@ -95,20 +95,29 @@ fun VideoScreen(room: Room) {
                 }
             }
 
-            Row(
+            Column(
                 modifier = Modifier.fillMaxWidth(),
-                horizontalArrangement = Arrangement.SpaceEvenly
+                horizontalAlignment = Alignment.CenterHorizontally,
             ) {
-                if (roomModel.roomId == null) {
-                    Button(onClick = room::createRoom, enabled = !roomModel.isJoining) {
-                        Text("Create")
-                    }
-
-                    JoinRoomButton(onJoin = room::joinRoom, enabled = !roomModel.isJoining)
+                Button(onClick = room::switchCamera) {
+                    Text("Switch camera")
                 }
 
-                Button(onClick = room::hangup) {
-                    Text("Hangup")
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceEvenly
+                ) {
+                    if (roomModel.roomId == null) {
+                        Button(onClick = room::createRoom, enabled = !roomModel.isJoining) {
+                            Text("Create")
+                        }
+
+                        JoinRoomButton(onJoin = room::joinRoom, enabled = !roomModel.isJoining)
+                    }
+
+                    Button(onClick = room::hangup) {
+                        Text("Hangup")
+                    }
                 }
             }
         }

diff --git a/sample/shared/src/commonMain/kotlin/com/shepeliev/webrtckmp/sample/shared/Room.kt b/sample/shared/src/commonMain/kotlin/com/shepeliev/webrtckmp/sample/shared/Room.kt
@@ -8,6 +8,7 @@ interface Room {
     val model: Value<Model>
 
     fun openUserMedia()
+    fun switchCamera()
     fun createRoom()
     fun joinRoom(roomId: String)
     fun hangup()

diff --git a/sample/shared/src/commonMain/kotlin/com/shepeliev/webrtckmp/sample/shared/RoomComponent.kt b/sample/shared/src/commonMain/kotlin/com/shepeliev/webrtckmp/sample/shared/RoomComponent.kt
@@ -88,6 +88,14 @@ class RoomComponent(
             }
         }
 
+        override fun switchCamera() {
+            logger.i { "Switch camera" }
+            scope.launch {
+                model.value.localStream?.videoTracks?.first()?.switchCamera()
+                logger.i { "Camera switched" }
+            }
+        }
+
         override fun createRoom() {
             logger.i { "Create room" }
 

diff --git a/webrtc-kmp/src/androidMain/kotlin/com/shepeliev/webrtckmp/CameraVideoCaptureController.kt b/webrtc-kmp/src/androidMain/kotlin/com/shepeliev/webrtckmp/CameraVideoCaptureController.kt
@@ -125,7 +125,7 @@ internal class CameraVideoCaptureController(
         }
 
         override fun onCameraClosed() {
-            videoCapturerErrorListener.onError("Camera closed")
+            // Do nothing
         }
     }
 }