Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add video processor factory for Android and iOS targets #125

Merged
merged 9 commits into from
Aug 17, 2024
Merged

Add video processor factory for Android and iOS targets #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e60ae40
android: add VideoProcessorFactory
shepeliev Jul 9, 2024
4cd4f85
android: fix arg name
shepeliev Jul 9, 2024
aef0c62
ios: add VideoProcessorFactory
shepeliev Jul 20, 2024
c91d539
Bump version
shepeliev Aug 14, 2024
c1c320c
Format code
shepeliev Aug 14, 2024
85d2f46
Rename property
shepeliev Aug 14, 2024
0479173
Revert version
shepeliev Aug 17, 2024
3a9f286
Format
shepeliev Aug 17, 2024
fbdd99e
Set VideoProcessor only if it os not null
shepeliev Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions webrtc-kmp/src/androidMain/kotlin/com/shepeliev/webrtckmp/MediaDevices.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ private object MediaDevicesImpl : MediaDevices {
if (constraints.video != null) {
checkCameraPermission()
val videoSource = WebRtc.peerConnectionFactory.createVideoSource(false)
videoSource.setVideoProcessor(WebRtc.videoProcessorFactory?.createVideoProcessor())
val videoCaptureController = CameraVideoCaptureController(
constraints.video,
videoSource
Expand All @@ -62,6 +63,7 @@ private object MediaDevicesImpl : MediaDevices {

override suspend fun getDisplayMedia(): MediaStream {
val videoSource = WebRtc.peerConnectionFactory.createVideoSource(false)
WebRtc.videoProcessorFactory?.createVideoProcessor()?.let { videoSource.setVideoProcessor(it) }
val screenCaptureController = ScreenCaptureController(videoSource)
val videoTrack = WebRtc.peerConnectionFactory.createVideoTrack(
UUID.randomUUID().toString(),
Expand Down
7 changes: 7 additions & 0 deletions webrtc-kmp/src/androidMain/kotlin/com/shepeliev/webrtckmp/VideoProcessorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.shepeliev.webrtckmp

import org.webrtc.VideoProcessor

fun interface VideoProcessorFactory {
fun createVideoProcessor(): VideoProcessor
}
2 changes: 2 additions & 0 deletions webrtc-kmp/src/androidMain/kotlin/com/shepeliev/webrtckmp/WebRtc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ object WebRtc {
var videoDecoderFactory: VideoDecoderFactory? = null
var customCameraEnumerator: CameraEnumerator? = null
var customPeerConnectionFactory: PeerConnectionFactory? = null
var videoProcessorFactory: VideoProcessorFactory? = null

lateinit var factoryInitializationOptionsBuilder: PeerConnectionFactory.InitializationOptions.Builder
private set

Expand Down
4 changes: 2 additions & 2 deletions webrtc-kmp/src/commonMain/kotlin/com/shepeliev/webrtckmp/MediaTrackConstraints.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ class MediaTrackConstraintsBuilder(internal var constraints: MediaTrackConstrain
constraints = constraints.copy(facingMode = constrain)
}

fun frameRate(ratio: Double) {
constraints = constraints.copy(frameRate = ratio.asValueConstrain())
fun frameRate(fps: Double) {
constraints = constraints.copy(frameRate = fps.asValueConstrain())
}

fun frameRate(build: ValueOrConstrain.Constrain<Double>.() -> Unit) {
Expand Down
6 changes: 3 additions & 3 deletions webrtc-kmp/src/iosMain/kotlin/com/shepeliev/webrtckmp/CameraVideoCaptureController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package com.shepeliev.webrtckmp

import WebRTC.RTCCameraVideoCapturer
import WebRTC.RTCVideoSource
import WebRTC.RTCVideoCapturerDelegateProtocol
import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.useContents
import platform.AVFoundation.AVCaptureDevice
Expand All @@ -19,7 +19,7 @@ import kotlin.math.abs

internal class CameraVideoCaptureController(
private val constraints: MediaTrackConstraints,
private val videoSource: RTCVideoSource,
private val videoCapturerDelegate: RTCVideoCapturerDelegateProtocol,
) : VideoCaptureController {
private var videoCapturer: RTCCameraVideoCapturer? = null
private var position: AVCaptureDevicePosition = AVCaptureDevicePositionBack
Expand All @@ -32,7 +32,7 @@ internal class CameraVideoCaptureController(

override fun startCapture() {
if (videoCapturer != null) return
videoCapturer = RTCCameraVideoCapturer(videoSource)
videoCapturer = RTCCameraVideoCapturer(videoCapturerDelegate)
if (!this::device.isInitialized) selectDevice()
selectFormat()
selectFps()
Expand Down
14 changes: 10 additions & 4 deletions webrtc-kmp/src/iosMain/kotlin/com/shepeliev/webrtckmp/MediaDevices.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@file:OptIn(ExperimentalForeignApi::class)

package com.shepeliev.webrtckmp

import WebRTC.RTCCameraVideoCapturer
Expand All @@ -10,6 +8,7 @@ import platform.Foundation.NSUUID

internal actual val mediaDevices: MediaDevices = MediaDevicesImpl

@OptIn(ExperimentalForeignApi::class)
private object MediaDevicesImpl : MediaDevices {
override suspend fun getUserMedia(streamConstraints: MediaStreamConstraintsBuilder.() -> Unit): MediaStream {
val constraints = MediaStreamConstraintsBuilder().let {
Expand All @@ -29,8 +28,15 @@ private object MediaDevicesImpl : MediaDevices {

val videoTrack = constraints.video?.let { videoConstraints ->
val videoSource = WebRtc.peerConnectionFactory.videoSource()
val iosVideoTrack = WebRtc.peerConnectionFactory.videoTrackWithSource(videoSource, NSUUID.UUID().UUIDString())
val videoCaptureController = CameraVideoCaptureController(videoConstraints, videoSource)
val videoProcessor = WebRtc.videoProcessorFactory?.createVideoProcessor(videoSource)
val iosVideoTrack = WebRtc.peerConnectionFactory.videoTrackWithSource(
source = videoSource,
trackId = NSUUID.UUID().UUIDString()
)
val videoCaptureController = CameraVideoCaptureController(
constraints = videoConstraints,
videoCapturerDelegate = videoProcessor ?: videoSource
)
LocalVideoStreamTrack(iosVideoTrack, videoCaptureController)
}

Expand Down
10 changes: 10 additions & 0 deletions webrtc-kmp/src/iosMain/kotlin/com/shepeliev/webrtckmp/VideoProcessorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.shepeliev.webrtckmp

import WebRTC.RTCVideoCapturerDelegateProtocol
import WebRTC.RTCVideoSource
import kotlinx.cinterop.ExperimentalForeignApi

@OptIn(ExperimentalForeignApi::class)
fun interface VideoProcessorFactory {
fun createVideoProcessor(videoSource: RTCVideoSource): RTCVideoCapturerDelegateProtocol
}
1 change: 1 addition & 0 deletions webrtc-kmp/src/iosMain/kotlin/com/shepeliev/webrtckmp/WebRtc.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ object WebRtc {
var videoDecoderFactory: RTCVideoDecoderFactoryProtocol? = null
var peerConnectionFactoryOptions: RTCPeerConnectionFactoryOptions? = null
var customPeerConnectionFactory: RTCPeerConnectionFactory? = null
var videoProcessorFactory: VideoProcessorFactory? = null

internal val peerConnectionFactory: RTCPeerConnectionFactory by lazy {
customPeerConnectionFactory ?: run {
Expand Down
Loading