bitmovin-player-react-native 0.20.0 → 0.22.0

package/RNBitmovinPlayer.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "BitmovinPlayer", "3.57.2"
-  s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.18.4"
-  s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.8.2"
+  s.dependency "BitmovinPlayer", "3.60.0"
+  s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.19.1"
+  s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.9.2"
 end

package/android/build.gradle

@@ -103,5 +103,5 @@ dependencies {
     // Bitmovin
     implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
-    implementation 'com.bitmovin.player:player:3.64.0+jason'
+    implementation 'com.bitmovin.player:player:3.65.0+jason'
 }

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

@@ -2,8 +2,7 @@ package com.bitmovin.player.reactnative
 
 import android.annotation.SuppressLint
 import android.content.res.Configuration
-import android.graphics.Rect
-import android.view.View
+import android.os.Build
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -17,8 +16,6 @@ import com.bitmovin.player.api.event.SourceEvent
 import com.bitmovin.player.api.ui.PlayerViewConfig
 import com.bitmovin.player.api.ui.StyleConfig
 import com.bitmovin.player.reactnative.converter.toJson
-import com.bitmovin.player.reactnative.ui.RNPictureInPictureDelegate
-import com.bitmovin.player.reactnative.ui.RNPictureInPictureHandler
 import com.facebook.react.ReactActivity
 import com.facebook.react.bridge.*
 import com.facebook.react.uimanager.events.RCTEventEmitter
@@ -101,7 +98,7 @@ private val EVENT_CLASS_TO_REACT_NATIVE_NAME_MAPPING_UI = mapOf<KClass<out Event
 @SuppressLint("ViewConstructor")
 class RNPlayerView(
     private val context: ReactApplicationContext,
-) : FrameLayout(context), View.OnLayoutChangeListener, RNPictureInPictureDelegate {
+) : FrameLayout(context) {
     private val activityLifecycle = (context.currentActivity as? ReactActivity)?.lifecycle
         ?: error("Trying to create an instance of ${this::class.simpleName} while not attached to a ReactActivity")
 
@@ -153,7 +150,6 @@ class RNPlayerView(
 
     private var _playerView: PlayerView? = null
         set(value) {
-            field?.removeOnLayoutChangeListener(this)
             field = value
             viewEventRelay.eventEmitter = field
             playerEventRelay.eventEmitter = field?.player
@@ -176,11 +172,6 @@ class RNPlayerView(
             playerEventRelay.eventEmitter = value
         }
 
-    /**
-     * Object that handles PiP mode changes in React Native.
-     */
-    var pictureInPictureHandler: RNPictureInPictureHandler? = null
-
     /**
      * Configures the visual presentation and behaviour of the [playerView].
      */
@@ -214,11 +205,6 @@ class RNPlayerView(
             (playerView.parent as ViewGroup?)?.removeView(playerView)
             addView(playerView, 0)
         }
-        pictureInPictureHandler?.let {
-            it.setDelegate(this)
-            playerView.setPictureInPictureHandler(it)
-            playerView.addOnLayoutChangeListener(this)
-        }
     }
 
     /**
@@ -232,61 +218,38 @@ class RNPlayerView(
         addView(subtitleView)
     }
 
-    /**
-     * Called whenever this view's activity configuration changes.
-     */
-    override fun onConfigurationChanged(newConfig: Configuration?) {
-        super.onConfigurationChanged(newConfig)
-        pictureInPictureHandler?.onConfigurationChanged(newConfig)
-    }
-
-    /**
-     * Called when the player has just entered PiP mode.
-     */
-    override fun onEnterPictureInPicture() {
-        // Nothing to do
-    }
-
-    /**
-     * Called when the player has just exited PiP mode.
-     */
-    override fun onExitPictureInPicture() {
-        // Explicitly call `exitPictureInPicture()` on PlayerView when exiting PiP state, otherwise
-        // the `PictureInPictureExit` event won't get dispatched.
-        playerView?.exitPictureInPicture()
+    private fun isInPictureInPictureMode(): Boolean {
+        val activity = context.currentActivity ?: return false
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            activity.isInPictureInPictureMode
+        } else {
+            false
+        }
     }
 
-    /**
-     * Called when the player's PiP mode changes with a new configuration object.
-     */
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
-        playerView?.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-    }
+    private var isCurrentActivityInPictureInPictureMode: Boolean = isInPictureInPictureMode()
 
     /**
-     * Called whenever the PiP handler needs to compute the PlayerView's global visible rect.
+     * Called whenever this view's activity configuration changes.
      */
-    override fun setSourceRectHint(sourceRectHint: Rect) {
-        playerView?.getGlobalVisibleRect(sourceRectHint)
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        if (isCurrentActivityInPictureInPictureMode != isInPictureInPictureMode()) {
+            isCurrentActivityInPictureInPictureMode = isInPictureInPictureMode()
+            onPictureInPictureModeChanged(isCurrentActivityInPictureInPictureMode, newConfig)
+        }
     }
 
-    /**
-     * Called whenever PlayerView's layout changes.
-     */
-    override fun onLayoutChange(
-        view: View?,
-        left: Int,
-        top: Int,
-        right: Int,
-        bottom: Int,
-        oldLeft: Int,
-        oldTop: Int,
-        oldRight: Int,
-        oldBottom: Int,
+    private fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        newConfig: Configuration,
     ) {
-        if (left != oldLeft || right != oldRight || top != oldTop || bottom != oldBottom) {
-            // Update source rect hint whenever the player's layout change
-            pictureInPictureHandler?.updateSourceRectHint()
+        val playerView = playerView ?: return
+        playerView.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        if (isInPictureInPictureMode) {
+            playerView.enterPictureInPicture()
+        } else {
+            playerView.exitPictureInPicture()
         }
     }
 
@@ -341,7 +304,7 @@ class RNPlayerView(
  */
 data class RNPlayerViewConfigWrapper(
     val playerViewConfig: PlayerViewConfig?,
-    val pictureInPictureConfig: RNPictureInPictureHandler.PictureInPictureConfig?,
+    val pictureInPictureConfig: PictureInPictureConfig?,
 )
 
 data class RNStyleConfigWrapper(
@@ -352,3 +315,8 @@ data class RNStyleConfigWrapper(
 enum class UserInterfaceType {
     Bitmovin, Subtitle
 }
+
+/**
+ * Configuration type for picture in picture behaviors.
+ */
+data class PictureInPictureConfig(val isEnabled: Boolean)

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

@@ -164,6 +164,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
         val command = commandId?.toInt()?.toCommand() ?: throw IllegalArgumentException(
             "The received command is not supported by the Bitmovin Player View",
         )
+
         fun <T> T?.require(): T = this ?: throw InvalidParameterException("Missing parameter")
         when (command) {
             Commands.ATTACH_PLAYER -> attachPlayer(view, args?.getString(1).require(), args?.getMap(2))
@@ -172,6 +173,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
                 view,
                 args?.getString(1).require(),
             )
+
             Commands.SET_FULLSCREEN -> setFullscreen(view, args?.getBoolean(1).require())
             Commands.SET_SCALING_MODE -> setScalingMode(view, args?.getString(1).require())
             Commands.SET_PICTURE_IN_PICTURE -> setPictureInPicture(view, args?.getBoolean(1).require())
@@ -246,9 +248,6 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
             val playbackConfig = playerConfig?.getMap("playbackConfig")
             val isPictureInPictureEnabled = view.config?.pictureInPictureConfig?.isEnabled == true ||
                 playbackConfig?.getBooleanOrNull("isPictureInPictureEnabled") == true
-            val pictureInPictureHandler = view.pictureInPictureHandler ?: RNPictureInPictureHandler(context)
-            view.pictureInPictureHandler = pictureInPictureHandler
-            view.pictureInPictureHandler?.isPictureInPictureEnabled = isPictureInPictureEnabled
 
             val rnStyleConfigWrapper = playerConfig?.toRNStyleConfigWrapperFromPlayerConfig()
             val configuredPlayerViewConfig = view.config?.playerViewConfig ?: PlayerViewConfig()
@@ -272,6 +271,9 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
                     LayoutParams.MATCH_PARENT,
                     LayoutParams.MATCH_PARENT,
                 )
+                if (isPictureInPictureEnabled) {
+                    playerView.setPictureInPictureHandler(RNPictureInPictureHandler(currentActivity, player))
+                }
                 view.setPlayerView(playerView)
                 attachCustomMessageHandlerBridge(view)
             }

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

@@ -47,6 +47,7 @@ import com.bitmovin.player.api.ui.ScalingMode
 import com.bitmovin.player.api.ui.StyleConfig
 import com.bitmovin.player.api.ui.UiConfig
 import com.bitmovin.player.reactnative.BitmovinCastManagerOptions
+import com.bitmovin.player.reactnative.PictureInPictureConfig
 import com.bitmovin.player.reactnative.RNBufferLevels
 import com.bitmovin.player.reactnative.RNPlayerViewConfigWrapper
 import com.bitmovin.player.reactnative.RNStyleConfigWrapper
@@ -70,7 +71,6 @@ import com.bitmovin.player.reactnative.extensions.withInt
 import com.bitmovin.player.reactnative.extensions.withMap
 import com.bitmovin.player.reactnative.extensions.withString
 import com.bitmovin.player.reactnative.extensions.withStringArray
-import com.bitmovin.player.reactnative.ui.RNPictureInPictureHandler.PictureInPictureConfig
 import com.facebook.react.bridge.*
 import java.util.UUID
 
@@ -217,6 +217,7 @@ fun ReadableMap.toAdSource(): AdSource? {
  * Converts any JS string into an `AdSourceType` enum value.
  */
 private fun String.toAdSourceType(): AdSourceType? = when (this) {
+    "bitmovin" -> AdSourceType.Bitmovin
     "ima" -> AdSourceType.Ima
     "progressive" -> AdSourceType.Progressive
     "unknown" -> AdSourceType.Unknown
@@ -626,6 +627,7 @@ fun AdSource.toJson(): WritableMap = Arguments.createMap().apply {
  * Converts any `AdSourceType` value into its json representation.
  */
 fun AdSourceType.toJson(): String = when (this) {
+    AdSourceType.Bitmovin -> "bitmovin"
     AdSourceType.Ima -> "ima"
     AdSourceType.Unknown -> "unknown"
     AdSourceType.Progressive -> "progressive"

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

@@ -1,200 +1,59 @@
 package com.bitmovin.player.reactnative.ui
 
+import android.app.Activity
 import android.app.PictureInPictureParams
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.graphics.Rect
 import android.os.Build
+import android.util.Log
 import android.util.Rational
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import com.bitmovin.player.api.ui.PictureInPictureHandler
-import com.facebook.react.bridge.ReactApplicationContext
+import com.bitmovin.player.api.Player
+import com.bitmovin.player.ui.DefaultPictureInPictureHandler
+
+private const val TAG = "RNPiPHandler"
+
+class RNPictureInPictureHandler(
+    private val activity: Activity,
+    private val player: Player,
+) : DefaultPictureInPictureHandler(activity, player) {
+    // Current PiP implementation on the native side requires playerView.exitPictureInPicture() to be called
+    // for `PictureInPictureExit` event to be emitted.
+    // Additionally, the event is only emitted if `isPictureInPicture` is true. At the point in time we call
+    // playerView.exitPictureInPicture() the activity will already have exited the PiP mode,
+    // and thus the event won't be emitted. To work around this we keep track of the PiP state ourselves.
+    private var _isPictureInPicture = false
 
-/**
- * Delegate object for `RNPictureInPictureHandler`. It delegates all view logic that needs
- * to be performed during each PiP state to this object.
- */
-interface RNPictureInPictureDelegate {
-    /**
-     * Called whenever the handler's `isInPictureInPictureMode` changes to `true`.
-     */
-    fun onExitPictureInPicture()
-
-    /**
-     * Called whenever the handler's `isInPictureInPictureMode` changes to `false`.
-     */
-    fun onEnterPictureInPicture()
-
-    /**
-     * Called whenever the activity's PiP mode state changes with the new resources configuration.
-     */
-    fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?)
-
-    /**
-     * Called whenever the handler needs to compute a new `sourceRectHint` for PiP params.
-     * The passed rect reference is expected to be fulfilled with the PlayerView's global visible
-     * rect.
-     */
-    fun setSourceRectHint(sourceRectHint: Rect)
-}
-
-/**
- * Custom  PictureInPictureHandler` concrete implementation designed for React Native. It relies on
- * React Native's application context to manage the application's PiP state. Can be subclassed in
- * order to provide custom PiP capabilities.
- */
-open class RNPictureInPictureHandler(val context: ReactApplicationContext) : PictureInPictureHandler {
-    /**
-     * Configuration type for picture in picture behaviors.
-     */
-    data class PictureInPictureConfig(val isEnabled: Boolean)
-
-    /**
-     * PiP delegate object that contains the view logic to be performed on each PiP state change.
-     */
-    private var delegate: RNPictureInPictureDelegate? = null
-
-    /**
-     * Whether the user has enabled PiP support via `isPictureInPictureEnabled` playback configuration in JS.
-     */
-    var isPictureInPictureEnabled = false
-
-    /**
-     * Whether this view is currently in PiP mode.
-     */
-    private var isInPictureInPictureMode = false
-
-    /**
-     * Whether the current Android version supports PiP mode.
-     */
-    private val isPictureInPictureSupported: Boolean
-        get() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N &&
-            context.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-
-    /**
-     * Whether the picture in picture feature is available and enabled.
-     */
-    override val isPictureInPictureAvailable: Boolean
-        get() = isPictureInPictureEnabled && isPictureInPictureSupported
-
-    /**
-     * Whether this view is currently in PiP mode. Required for PictureInPictureHandler interface.
-     */
     override val isPictureInPicture: Boolean
-        get() = isInPictureInPictureMode
-
-    /**
-     * Current React activity computed property.
-     */
-    private val currentActivity: AppCompatActivity?
-        get() {
-            if (context.hasCurrentActivity()) {
-                return context.currentActivity as AppCompatActivity
-            }
-            return null
-        }
-
-    /**
-     * Sets the new delegate object and update the activity's PiP parameters accordingly.
-     */
-    open fun setDelegate(delegate: RNPictureInPictureDelegate?) {
-        this.delegate = delegate
-        // Update the activity's PiP params once the delegate has been set.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isPictureInPictureAvailable) {
-            applyPictureInPictureParams()
-        }
-    }
+        get() = _isPictureInPicture
 
-    /**
-     * Called whenever bitmovin's `PlayerView` needs to enter PiP mode.
-     */
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun enterPictureInPicture() {
-        if (isPictureInPictureAvailable) {
-            currentActivity?.let {
-                it.supportActionBar?.hide()
-                it.enterPictureInPictureMode()
-            }
+        if (!isPictureInPictureAvailable) {
+            Log.w(TAG, "Calling enterPictureInPicture without PiP support.")
+            return
         }
-    }
 
-    /**
-     * Called whenever bitmovin's `PlayerView` needs to exit PiP mode.
-     */
-    override fun exitPictureInPicture() {
-        if (isPictureInPictureAvailable) {
-            currentActivity?.supportActionBar?.show()
+        if (isPictureInPicture) {
+            return
         }
-    }
 
-    /**
-     * Called whenever the activity content resources have changed.
-     */
-    open fun onConfigurationChanged(newConfig: Configuration?) {
-        // PiP mode is supported since Android 7.0
-        if (isPictureInPictureAvailable) {
-            handlePictureInPictureModeChanges(newConfig)
-        }
-    }
+        // The default implementation doesn't properly handle the case where source isn't loaded yet.
+        // To work around it we just use a 16:9 aspect ratio if we cannot calculate it from `playbackVideoData`.
+        val aspectRatio =
+            player.playbackVideoData
+                ?.let { Rational(it.width, it.height) }
+                ?: Rational(16, 9)
 
-    /**
-     * Checks whether the current activity `isInPictureInPictureMode` has changed since the last lifecycle
-     * configuration change.
-     */
-    @RequiresApi(Build.VERSION_CODES.N)
-    private fun handlePictureInPictureModeChanges(newConfig: Configuration?) = currentActivity?.let {
-        if (isInPictureInPictureMode != it.isInPictureInPictureMode) {
-            delegate?.onPictureInPictureModeChanged(it.isInPictureInPictureMode, newConfig)
-            if (it.isInPictureInPictureMode) {
-                delegate?.onEnterPictureInPicture()
-            } else {
-                delegate?.onExitPictureInPicture()
-            }
-            isInPictureInPictureMode = it.isInPictureInPictureMode
-        }
-    }
+        val params =
+            PictureInPictureParams.Builder()
+                .setAspectRatio(aspectRatio)
+                .build()
 
-    /**
-     * Applies Android recommended PiP params on the current activity for smoother transitions.
-     *
-     * You can read more about the recommended settings for PiP here:
-     * - https://developer.android.com/develop/ui/views/picture-in-picture#smoother-transition
-     * - https://developer.android.com/develop/ui/views/picture-in-picture#smoother-exit
-     */
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun applyPictureInPictureParams() = currentActivity?.let {
-        // See also: https://developer.android.com/develop/ui/views/picture-in-picture#smoother-transition
-        val sourceRectHint = Rect()
-        delegate?.setSourceRectHint(sourceRectHint)
-        val ratio = Rational(16, 9)
-        val params = PictureInPictureParams.Builder()
-            .setAspectRatio(ratio)
-            .setSourceRectHint(sourceRectHint)
-        when {
-            // See also: https://developer.android.com/develop/ui/views/picture-in-picture#smoother-exit
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ->
-                params.setAutoEnterEnabled(true).setSeamlessResizeEnabled(true)
-            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ->
-                params.setExpandedAspectRatio(ratio)
-        }
-        it.setPictureInPictureParams(params.build())
+        activity.enterPictureInPictureMode(params)
+        _isPictureInPicture = true
     }
 
-    /**
-     * Update source rect hint on activity's PiP params.
-     */
-    open fun updateSourceRectHint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O || !isPictureInPictureAvailable) {
-            return
-        }
-        currentActivity?.let {
-            val sourceRectHint = Rect()
-            delegate?.setSourceRectHint(sourceRectHint)
-            it.setPictureInPictureParams(
-                PictureInPictureParams.Builder()
-                    .setSourceRectHint(sourceRectHint)
-                    .build(),
-            )
-        }
+    override fun exitPictureInPicture() {
+        super.exitPictureInPicture()
+        _isPictureInPicture = false
     }
 }

package/ios/RCTConvert+BitmovinPlayer.swift

@@ -159,6 +159,11 @@ extension RCTConvert {
                 break
             }
         }
+#if !os(tvOS)
+        if let updatesNowPlayingInfoCenter = json["updatesNowPlayingInfoCenter"] as? Bool {
+            tweaksConfig.updatesNowPlayingInfoCenter = updatesNowPlayingInfoCenter
+        }
+#endif
         return tweaksConfig
     }
 

package/lib/index.d.mts

@@ -2786,6 +2786,18 @@ interface TweaksConfig {
      * @platform Android
      */
     preferSoftwareDecodingForAds?: boolean;
+    /**
+     * Determines whether `AVKit` should update Now Playing information automatically when using System UI.
+     *
+     * - If set to `false`, the automatic updates of Now Playing Info sent by `AVKit` are disabled.
+     *   This prevents interference with manual updates you may want to perform.
+     * - If set to `true`, the default behaviour is maintained, allowing `AVKit` to handle Now Playing updates.
+     *
+     * Default is `true`.
+     *
+     * @platform iOS
+     */
+    updatesNowPlayingInfoCenter?: boolean;
 }
 
 /**

package/lib/index.d.ts

@@ -2786,6 +2786,18 @@ interface TweaksConfig {
      * @platform Android
      */
     preferSoftwareDecodingForAds?: boolean;
+    /**
+     * Determines whether `AVKit` should update Now Playing information automatically when using System UI.
+     *
+     * - If set to `false`, the automatic updates of Now Playing Info sent by `AVKit` are disabled.
+     *   This prevents interference with manual updates you may want to perform.
+     * - If set to `true`, the default behaviour is maintained, allowing `AVKit` to handle Now Playing updates.
+     *
+     * Default is `true`.
+     *
+     * @platform iOS
+     */
+    updatesNowPlayingInfoCenter?: boolean;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitmovin-player-react-native",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "Official React Native bindings for Bitmovin's mobile Player SDKs.",
   "main": "lib/index.js",
   "module": "lib/index.mjs",

package/src/tweaksConfig.ts

@@ -157,4 +157,16 @@ export interface TweaksConfig {
    * @platform Android
    */
   preferSoftwareDecodingForAds?: boolean;
+  /**
+   * Determines whether `AVKit` should update Now Playing information automatically when using System UI.
+   *
+   * - If set to `false`, the automatic updates of Now Playing Info sent by `AVKit` are disabled.
+   *   This prevents interference with manual updates you may want to perform.
+   * - If set to `true`, the default behaviour is maintained, allowing `AVKit` to handle Now Playing updates.
+   *
+   * Default is `true`.
+   *
+   * @platform iOS
+   */
+  updatesNowPlayingInfoCenter?: boolean;
 }