Fix rendering video in sample iOS app (#137)

shepeliev · Sep 18, 2024 · 62ad8af · 62ad8af
1 parent b2a0d9f
commit 62ad8af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/sample/composeApp/src/commonMain/kotlin/App.kt b/sample/composeApp/src/commonMain/kotlin/App.kt
@@ -57,17 +57,30 @@ fun App() {
         Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
             val localVideoTrack = localStream?.videoTracks?.firstOrNull()
 
-            localVideoTrack?.let { Video(videoTrack = it, modifier = Modifier.weight(1f)) }
-                ?: Box(modifier = Modifier.weight(1f))
+            localVideoTrack?.let {
+                Video(
+                    videoTrack = it,
+                    modifier = Modifier.weight(1f).fillMaxWidth()
+                )
+            } ?: Box(
+                modifier = Modifier.weight(1f).fillMaxWidth(),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text("Local video")
+            }
 
             remoteVideoTrack?.let {
                 Video(
                     videoTrack = it,
                     audioTrack = remoteAudioTrack,
-                    modifier = Modifier.weight(1f),
+                    modifier = Modifier.weight(1f).fillMaxWidth(),
                 )
+            } ?: Box(
+                modifier = Modifier.weight(1f).fillMaxWidth(),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text("Remote video")
             }
-                ?: Box(modifier = Modifier.weight(1f))
 
             Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
                 if (localStream == null) {

diff --git a/sample/composeApp/src/iosMain/kotlin/Video.ios.kt b/sample/composeApp/src/iosMain/kotlin/Video.ios.kt
@@ -13,10 +13,11 @@ actual fun Video(videoTrack: VideoStreamTrack, modifier: Modifier, audioTrack: A
     UIKitView(
         factory = {
             RTCMTLVideoView().apply {
-                contentMode = UIViewContentMode.UIViewContentModeScaleAspectFit
+                videoContentMode = UIViewContentMode.UIViewContentModeScaleAspectFit
                 videoTrack.addRenderer(this)
             }
         },
         modifier = modifier,
+        onRelease = { videoTrack.removeRenderer(it) }
     )
 }
diff --git a/sample/iosApp/iosApp/ContentView.swift b/sample/iosApp/iosApp/ContentView.swift
@@ -16,6 +16,3 @@ struct ContentView: View {
                 .ignoresSafeArea(.keyboard) // Compose has own keyboard handler
     }
 }
-
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,3 @@ struct ContentView: View {
		.ignoresSafeArea(.keyboard) // Compose has own keyboard handler
		}
		}