bitmovin-player-react-native 0.40.0 → 0.42.0

package/RNBitmovinPlayer.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = "5.10"
   s.dependency "React-Core"
-  s.dependency "BitmovinPlayer", "3.85.2"
+  s.dependency "BitmovinPlayer", "3.90.0"
   s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.23.0"
   s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.13.0"
 end

package/android/build.gradle

@@ -103,8 +103,8 @@ dependencies {
     implementation "androidx.concurrent:concurrent-futures-ktx:1.1.0"
 
     // Bitmovin
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.33.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.35.1'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
-    implementation 'com.bitmovin.player:player:3.104.2+jason'
-    implementation 'com.bitmovin.player:player-media-session:3.104.2+jason'
+    implementation 'com.bitmovin.player:player:3.112.0+jason'
+    implementation 'com.bitmovin.player:player-media-session:3.112.0+jason'
 }

package/android/gradle.properties

@@ -1,8 +1,8 @@
 android.useAndroidX=true
 BitmovinPlayerReactNative_kotlinVersion=1.9.21
 BitmovinPlayerReactNative_minSdkVersion=21
-BitmovinPlayerReactNative_targetSdkVersion=34
-BitmovinPlayerReactNative_compileSdkVersion=34
+BitmovinPlayerReactNative_targetSdkVersion=35
+BitmovinPlayerReactNative_compileSdkVersion=35
 BitmovinPlayerReactNative_buildToolsVersion=34.0.0
 BitmovinPlayerReactNative_ndkversion=25.1.8937393
 BitmovinPlayerReactNative_androidToolsVersion=8.1.0

package/android/src/main/java/com/bitmovin/player/reactnative/BitmovinBaseModule.kt

@@ -3,6 +3,7 @@ package com.bitmovin.player.reactnative
 import android.util.Log
 import com.bitmovin.player.api.Player
 import com.bitmovin.player.api.source.Source
+import com.bitmovin.player.reactnative.extensions.decoderConfigModule
 import com.bitmovin.player.reactnative.extensions.drmModule
 import com.bitmovin.player.reactnative.extensions.networkModule
 import com.bitmovin.player.reactnative.extensions.offlineModule
@@ -58,6 +59,9 @@ abstract class BitmovinBaseModule(
     protected val RejectPromiseOnExceptionBlock.networkModule: NetworkModule get() = context.networkModule
         ?: throw IllegalStateException("NetworkModule not found")
 
+    protected val RejectPromiseOnExceptionBlock.decoderConfigModule: DecoderConfigModule
+        get() = context.decoderConfigModule ?: throw IllegalStateException("DecoderConfigModule not found")
+
     fun RejectPromiseOnExceptionBlock.getPlayer(
         nativeId: NativeId,
         playerModule: PlayerModule = this.playerModule,

package/android/src/main/java/com/bitmovin/player/reactnative/DecoderConfigModule.kt

@@ -0,0 +1,81 @@
+package com.bitmovin.player.reactnative
+
+import androidx.concurrent.futures.CallbackToFutureAdapter
+import com.bitmovin.player.api.decoder.DecoderConfig
+import com.bitmovin.player.api.decoder.DecoderPriorityProvider
+import com.bitmovin.player.api.decoder.MediaCodecInfo
+import com.bitmovin.player.reactnative.converter.toJson
+import com.bitmovin.player.reactnative.converter.toMediaCodecInfoList
+import com.facebook.react.bridge.*
+import com.facebook.react.module.annotations.ReactModule
+import java.util.concurrent.ConcurrentHashMap
+
+private const val MODULE_NAME = "DecoderConfigModule"
+
+@ReactModule(name = MODULE_NAME)
+class DecoderConfigModule(context: ReactApplicationContext) : BitmovinBaseModule(context) {
+    override fun getName() = MODULE_NAME
+
+    /**
+     * In-memory mapping from `nativeId`s to `DecoderConfig` instances.
+     */
+    private val decoderConfigs: Registry<DecoderConfig> = mutableMapOf()
+    private val overrideDecoderPriorityProviderCompleters =
+        ConcurrentHashMap<NativeId, CallbackToFutureAdapter.Completer<List<MediaCodecInfo>>>()
+
+    fun getConfig(nativeId: NativeId?): DecoderConfig? = nativeId?.let { decoderConfigs[it] }
+
+    @ReactMethod
+    fun initWithConfig(nativeId: NativeId, config: ReadableMap, promise: Promise) {
+        if (decoderConfigs.containsKey(nativeId)) {
+            return
+        }
+        if (config.getMap("playbackConfig")?.hasKey("decoderConfig") == false) {
+            return
+        }
+
+        val decoderConfig = DecoderConfig(
+            decoderPriorityProvider = object : DecoderPriorityProvider {
+                override fun overrideDecodersPriority(
+                    context: DecoderPriorityProvider.DecoderContext,
+                    preferredDecoders: List<MediaCodecInfo>,
+                ): List<MediaCodecInfo> {
+                    return overrideDecoderPriorityProvider(nativeId, context, preferredDecoders)
+                }
+            },
+        )
+        decoderConfigs[nativeId] = decoderConfig
+    }
+
+    @ReactMethod
+    fun destroy(nativeId: NativeId) {
+        decoderConfigs.remove(nativeId)
+        overrideDecoderPriorityProviderCompleters.keys.filter { it.startsWith(nativeId) }.forEach {
+            overrideDecoderPriorityProviderCompleters.remove(it)
+        }
+    }
+
+    private fun overrideDecoderPriorityProvider(
+        nativeId: NativeId,
+        context: DecoderPriorityProvider.DecoderContext,
+        preferredDecoders: List<MediaCodecInfo>,
+    ): List<MediaCodecInfo> {
+        return CallbackToFutureAdapter.getFuture { completer ->
+            overrideDecoderPriorityProviderCompleters[nativeId] = completer
+            val args = Arguments.createArray()
+            args.pushMap(context.toJson())
+            args.pushArray(preferredDecoders.toJson())
+            this@DecoderConfigModule.context.catalystInstance.callFunction(
+                "DecoderConfigBridge-$nativeId",
+                "overrideDecodersPriority",
+                args as NativeArray,
+            )
+        }.get()
+    }
+
+    @ReactMethod
+    fun overrideDecoderPriorityProviderComplete(nativeId: NativeId, response: ReadableArray) {
+        overrideDecoderPriorityProviderCompleters[nativeId]?.set(response.toMediaCodecInfoList())
+        overrideDecoderPriorityProviderCompleters.remove(nativeId)
+    }
+}

package/android/src/main/java/com/bitmovin/player/reactnative/PlayerModule.kt

@@ -43,8 +43,21 @@ class PlayerModule(context: ReactApplicationContext) : BitmovinBaseModule(contex
      * @param config `PlayerConfig` object received from JS.
      */
     @ReactMethod
-    fun initWithConfig(nativeId: NativeId, config: ReadableMap?, networkNativeId: NativeId?, promise: Promise) {
-        init(nativeId, config, networkNativeId = networkNativeId, analyticsConfigJson = null, promise)
+    fun initWithConfig(
+        nativeId: NativeId,
+        config: ReadableMap?,
+        networkNativeId: NativeId?,
+        decoderNativeId: NativeId?,
+        promise: Promise,
+    ) {
+        init(
+            nativeId,
+            config,
+            networkNativeId = networkNativeId,
+            decoderNativeId = decoderNativeId,
+            analyticsConfigJson = null,
+            promise,
+        )
     }
 
     /**
@@ -57,14 +70,23 @@ class PlayerModule(context: ReactApplicationContext) : BitmovinBaseModule(contex
         nativeId: NativeId,
         playerConfigJson: ReadableMap?,
         networkNativeId: NativeId?,
+        decoderNativeId: NativeId?,
         analyticsConfigJson: ReadableMap,
         promise: Promise,
-    ) = init(nativeId, playerConfigJson, networkNativeId, analyticsConfigJson, promise)
+    ) = init(
+        nativeId,
+        playerConfigJson,
+        networkNativeId,
+        decoderNativeId,
+        analyticsConfigJson,
+        promise,
+    )
 
     private fun init(
         nativeId: NativeId,
         playerConfigJson: ReadableMap?,
         networkNativeId: NativeId?,
+        decoderNativeId: NativeId?,
         analyticsConfigJson: ReadableMap?,
         promise: Promise,
     ) = promise.unit.resolveOnUiThread {
@@ -85,6 +107,11 @@ class PlayerModule(context: ReactApplicationContext) : BitmovinBaseModule(contex
             playerConfig.networkConfig = networkConfig
         }
 
+        val decoderConfig = decoderNativeId?.let { decoderConfigModule.getConfig(it) }
+        if (decoderConfig != null) {
+            playerConfig.playbackConfig = playerConfig.playbackConfig.copy(decoderConfig = decoderConfig)
+        }
+
         players[nativeId] = if (analyticsConfig == null) {
             Player.create(context, playerConfig)
         } else {

package/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewPackage.kt

@@ -31,6 +31,7 @@ class RNPlayerViewPackage : ReactPackage {
             BufferModule(reactContext),
             NetworkModule(reactContext),
             DebugModule(reactContext),
+            DecoderConfigModule(reactContext),
         )
     }
 

package/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt

@@ -25,6 +25,8 @@ import com.bitmovin.player.api.buffer.BufferLevel
 import com.bitmovin.player.api.buffer.BufferMediaTypeConfig
 import com.bitmovin.player.api.buffer.BufferType
 import com.bitmovin.player.api.casting.RemoteControlConfig
+import com.bitmovin.player.api.decoder.DecoderPriorityProvider.DecoderContext
+import com.bitmovin.player.api.decoder.MediaCodecInfo
 import com.bitmovin.player.api.drm.WidevineConfig
 import com.bitmovin.player.api.event.PlayerEvent
 import com.bitmovin.player.api.event.SourceEvent
@@ -32,6 +34,7 @@ import com.bitmovin.player.api.event.data.CastPayload
 import com.bitmovin.player.api.event.data.SeekPosition
 import com.bitmovin.player.api.live.LiveConfig
 import com.bitmovin.player.api.media.AdaptationConfig
+import com.bitmovin.player.api.media.MediaTrackRole
 import com.bitmovin.player.api.media.MediaType
 import com.bitmovin.player.api.media.audio.AudioTrack
 import com.bitmovin.player.api.media.subtitle.SubtitleTrack
@@ -206,7 +209,6 @@ fun ReadableMap.toTweaksConfig(): TweaksConfig = TweaksConfig().apply {
     withBoolean("useDrmSessionForClearPeriods") { useDrmSessionForClearPeriods = it }
     withBoolean("useDrmSessionForClearSources") { useDrmSessionForClearSources = it }
     withBoolean("useFiletypeExtractorFallbackForHls") { useFiletypeExtractorFallbackForHls = it }
-    withBoolean("preferSoftwareDecodingForAds") { preferSoftwareDecodingForAds = it }
     withStringArray("forceReuseVideoCodecReasons") {
         forceReuseVideoCodecReasons = it
             .filterNotNull()
@@ -558,6 +560,7 @@ fun AudioTrack.toJson(): WritableMap = Arguments.createMap().apply {
     putBoolean("isDefault", isDefault)
     putString("identifier", id)
     putString("language", language)
+    putArray("roles", roles.mapToReactArray { it.toJson() })
 }
 
 /**
@@ -595,6 +598,7 @@ fun SubtitleTrack.toJson(): WritableMap = Arguments.createMap().apply {
     putString("language", language)
     putBoolean("isForced", isForced)
     putString("format", mimeType?.textMimeTypeToJson())
+    putArray("roles", roles.mapToReactArray { it.toJson() })
 }
 
 /**
@@ -949,3 +953,43 @@ private fun CastPayload.toJson(): WritableMap = Arguments.createMap().apply {
 }
 
 private fun WritableMap.putStringIfNotNull(name: String, value: String?) = value?.let { putString(name, value) }
+
+fun DecoderContext.toJson(): ReadableMap = Arguments.createMap().apply {
+    putString("mediaType", mediaType.name)
+    putBoolean("isAd", isAd)
+}
+
+fun List<MediaCodecInfo>.toJson(): ReadableArray = Arguments.createArray().apply {
+    forEach {
+        pushMap(it.toJson())
+    }
+}
+
+fun MediaCodecInfo.toJson(): ReadableMap = Arguments.createMap().apply {
+    putString("name", name)
+    putBoolean("isSoftware", isSoftware)
+}
+
+fun ReadableArray.toMediaCodecInfoList(): List<MediaCodecInfo> {
+    if (size() <= 0) {
+        return emptyList()
+    }
+    val mediaCodecInfoList = mutableListOf<MediaCodecInfo>()
+    (0 until size()).forEach {
+        val info = getMap(it).toMediaCodecInfo() ?: return@forEach
+        mediaCodecInfoList.add(info)
+    }
+    return mediaCodecInfoList
+}
+
+fun ReadableMap.toMediaCodecInfo(): MediaCodecInfo? {
+    val name = getString("name") ?: return null
+    val isSoftware = getBooleanOrNull("isSoftware") ?: return null
+    return MediaCodecInfo(name, isSoftware)
+}
+
+fun MediaTrackRole.toJson(): WritableMap = Arguments.createMap().apply {
+    putString("id", id)
+    putString("schemeIdUri", schemeIdUri)
+    putString("value", value)
+}

package/android/src/main/java/com/bitmovin/player/reactnative/extensions/ReactContextExtension.kt

@@ -1,5 +1,6 @@
 package com.bitmovin.player.reactnative.extensions
 
+import com.bitmovin.player.reactnative.DecoderConfigModule
 import com.bitmovin.player.reactnative.DrmModule
 import com.bitmovin.player.reactnative.NetworkModule
 import com.bitmovin.player.reactnative.OfflineModule
@@ -20,3 +21,4 @@ val ReactApplicationContext.uiManagerModule get() = getModule<UIManagerModule>()
 val ReactApplicationContext.drmModule get() = getModule<DrmModule>()
 val ReactApplicationContext.customMessageHandlerModule get() = getModule<CustomMessageHandlerModule>()
 val ReactApplicationContext.networkModule get() = getModule<NetworkModule>()
+val ReactApplicationContext.decoderConfigModule get() = getModule<DecoderConfigModule>()

package/android/src/main/java/com/bitmovin/player/reactnative/offline/OfflineContentManagerBridge.kt

@@ -150,12 +150,12 @@ class OfflineContentManagerBridge(
     /**
      * Called when a process call has completed.
      */
-    override fun onCompleted(source: SourceConfig?, options: OfflineContentOptions?) {
+    override fun onCompleted(source: SourceConfig, options: OfflineContentOptions) {
         this.contentOptions = options
         sendEvent(
             OfflineEventType.ON_COMPLETED,
             Arguments.createMap().apply {
-                putMap("options", options?.toJson())
+                putMap("options", options.toJson())
             },
         )
     }
@@ -163,12 +163,12 @@ class OfflineContentManagerBridge(
     /**
      * Called when an error occurs.
      */
-    override fun onError(source: SourceConfig?, event: ErrorEvent?) {
+    override fun onError(source: SourceConfig, event: ErrorEvent) {
         sendEvent(
             OfflineEventType.ON_ERROR,
             Arguments.createMap().apply {
-                event?.code?.value?.let { putInt("code", it) }
-                putString("message", event?.message)
+                putInt("code", event.code.value)
+                putString("message", event.message)
             },
         )
     }
@@ -176,7 +176,7 @@ class OfflineContentManagerBridge(
     /**
      * Called when the progress for a process call changes.
      */
-    override fun onProgress(source: SourceConfig?, progress: Float) {
+    override fun onProgress(source: SourceConfig, progress: Float) {
         sendEvent(
             OfflineEventType.ON_PROGRESS,
             Arguments.createMap().apply {
@@ -188,12 +188,12 @@ class OfflineContentManagerBridge(
     /**
      * Called after a getOptions or when am OfflineOptionEntry has been updated during a process call.
      */
-    override fun onOptionsAvailable(source: SourceConfig?, options: OfflineContentOptions?) {
+    override fun onOptionsAvailable(source: SourceConfig, options: OfflineContentOptions) {
         this.contentOptions = options
         sendEvent(
             OfflineEventType.ON_OPTIONS_AVAILABLE,
             Arguments.createMap().apply {
-                putMap("options", options?.toJson())
+                putMap("options", options.toJson())
             },
         )
     }
@@ -201,21 +201,21 @@ class OfflineContentManagerBridge(
     /**
      * Called when the DRM license was updated.
      */
-    override fun onDrmLicenseUpdated(source: SourceConfig?) {
+    override fun onDrmLicenseUpdated(source: SourceConfig) {
         sendEvent(OfflineEventType.ON_DRM_LICENSE_UPDATED)
     }
 
     /**
      * Called when all actions have been suspended.
      */
-    override fun onSuspended(source: SourceConfig?) {
+    override fun onSuspended(source: SourceConfig) {
         sendEvent(OfflineEventType.ON_SUSPENDED)
     }
 
     /**
      * Called when all actions have been resumed.
      */
-    override fun onResumed(source: SourceConfig?) {
+    override fun onResumed(source: SourceConfig) {
         sendEvent(OfflineEventType.ON_RESUMED)
     }
 

package/ios/PlayerModule.m

@@ -2,8 +2,8 @@
 
 @interface RCT_EXTERN_REMAP_MODULE(PlayerModule, PlayerModule, NSObject)
 
-RCT_EXTERN_METHOD(initWithConfig:(NSString *)nativeId config:(nullable id)config networkNativeId:(nullable NSString *)networkNativeId)
-RCT_EXTERN_METHOD(initWithAnalyticsConfig:(NSString *)nativeId config:(nullable id)config networkNativeId:(nullable NSString *)networkNativeId analyticsConfig:(nullable id)analyticsConfig)
+RCT_EXTERN_METHOD(initWithConfig:(NSString *)nativeId config:(nullable id)config networkNativeId:(nullable NSString *)networkNativeId decoderNativeId:(nullable NSString *)decoderNativeId)
+RCT_EXTERN_METHOD(initWithAnalyticsConfig:(NSString *)nativeId config:(nullable id)config networkNativeId:(nullable NSString *)networkNativeId analyticsConfig:(nullable id)analyticsConfig decoderNativeId:(nullable NSString *)decoderNativeId)
 RCT_EXTERN_METHOD(loadSource:(NSString *)nativeId sourceNativeId:(NSString *)sourceNativeId)
 RCT_EXTERN_METHOD(loadOfflineContent:(NSString *)nativeId offlineContentManagerBridgeId:(NSString *)offlineContentManagerBridgeId options:(nullable id)options)
 RCT_EXTERN_METHOD(unload:(NSString *)nativeId)

package/ios/PlayerModule.swift

@@ -46,11 +46,12 @@ public class PlayerModule: NSObject, RCTBridgeModule { // swiftlint:disable:this
      Creates a new `Player` instance inside the internal players using the provided `config` object.
      - Parameter config: `PlayerConfig` object received from JS.
      */
-    @objc(initWithConfig:config:networkNativeId:)
+    @objc(initWithConfig:config:networkNativeId:decoderNativeId:)
     func initWithConfig(
         _ nativeId: NativeId,
         config: Any?,
-        networkNativeId: NativeId?
+        networkNativeId: NativeId?,
+        decoderNativeId: NativeId?
     ) {
         bridge.uiManager.addUIBlock { [weak self] _, _ in
             guard
@@ -76,12 +77,13 @@ public class PlayerModule: NSObject, RCTBridgeModule { // swiftlint:disable:this
      - Parameter config: `PlayerConfig` object received from JS.
      - Parameter analyticsConfig: `AnalyticsConfig` object received from JS.
      */
-    @objc(initWithAnalyticsConfig:config:networkNativeId:analyticsConfig:)
+    @objc(initWithAnalyticsConfig:config:networkNativeId:analyticsConfig:decoderNativeId:)
     func initWithAnalyticsConfig(
         _ nativeId: NativeId,
         config: Any?,
         networkNativeId: NativeId?,
-        analyticsConfig: Any?
+        analyticsConfig: Any?,
+        decoderNativeId: NativeId?
     ) {
         bridge.uiManager.addUIBlock { [weak self] _, _ in
             let analyticsConfigJson = analyticsConfig

package/ios/RCTConvert+BitmovinPlayer.swift

@@ -561,13 +561,20 @@ extension RCTConvert {
         guard let audioTrack else {
             return nil
         }
-        return [
+        var audioTrackDict: [String: Any?] = [
             "url": audioTrack.url?.absoluteString,
             "label": audioTrack.label,
             "isDefault": audioTrack.isDefaultTrack,
             "identifier": audioTrack.identifier,
             "language": audioTrack.language
         ]
+        audioTrackDict["roles"] = audioTrack.characteristics.map { characteristic in
+            [
+                "schemeIdUri": "urn:hls:characteristic",
+                "value": characteristic
+            ]
+        }
+        return audioTrackDict
     }
 
     /**
@@ -641,26 +648,34 @@ extension RCTConvert {
         guard let subtitleTrack else {
             return nil
         }
-        return [
+        var subtitleTrackDict: [String: Any?] = [
             "url": subtitleTrack.url?.absoluteString,
             "label": subtitleTrack.label,
             "isDefault": subtitleTrack.isDefaultTrack,
             "identifier": subtitleTrack.identifier,
             "language": subtitleTrack.language,
             "isForced": subtitleTrack.isForced,
-            "format": {
-                switch subtitleTrack.format {
-                case .cea:
-                    return "cea"
-                case .webVtt:
-                    return "vtt"
-                case .ttml:
-                    return "ttml"
-                case .srt:
-                    return "srt"
-                }
-            }(),
         ]
+        switch subtitleTrack.format {
+        case .cea:
+            subtitleTrackDict["format"] = "cea"
+        case .webVtt:
+            subtitleTrackDict["format"] = "vtt"
+        case .ttml:
+            subtitleTrackDict["format"] = "ttml"
+        case .srt:
+            subtitleTrackDict["format"] = "srt"
+        default:
+            break
+        }
+
+        subtitleTrackDict["roles"] = subtitleTrack.characteristics.map { characteristic in
+            [
+                "schemeIdUri": "urn:hls:characteristic",
+                "value": characteristic
+            ]
+        }
+        return subtitleTrackDict
     }
 
     /**