Merge tag 'v6.0.0-beta.8' into feat/android-pip

Release v6.0.0-beta.8
TheWidlarzGroup · Apr 10, 2024 · c1c7625 · c1c7625
2 parents 5c5ab63 + f28bf0a
commit c1c7625
Show file tree

Hide file tree

Showing 32 changed files with 1,113 additions and 967 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,36 @@
 
 
+# [6.0.0-beta.8](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.7...v6.0.0-beta.8) (2024-04-03)
+
+
+### Bug Fixes
+
+* **android:** update ui manager getter ([#3634](https://github.com/react-native-video/react-native-video/issues/3634)) ([e87c14a](https://github.com/react-native-video/react-native-video/commit/e87c14a4375d47a03447716b1920608855df5d8d))
+* fix codegen types ([#3636](https://github.com/react-native-video/react-native-video/issues/3636)) ([9b66e7f](https://github.com/react-native-video/react-native-video/commit/9b66e7fdce0393c4e2154a23b407de6c46dc9490))
+
+# [6.0.0-beta.7](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.6...v6.0.0-beta.7) (2024-03-30)
+
+
+### Bug Fixes
+
+* **android:** ensure rate is never set to 0 ([#3593](https://github.com/react-native-video/react-native-video/issues/3593)) ([3d7444a](https://github.com/react-native-video/react-native-video/commit/3d7444ab25c365b36e0e8d2672b74f474bba12eb))
+* **android:** improve and backBufferDurationMs. mainly let exoplayer manage the prop ([#3619](https://github.com/react-native-video/react-native-video/issues/3619)) ([f10511d](https://github.com/react-native-video/react-native-video/commit/f10511d9534257a8fc9a4a47978d9c844428f1f7))
+* **android:** keep screen on on fullscreen ([#3563](https://github.com/react-native-video/react-native-video/issues/3563)) ([bfb76e6](https://github.com/react-native-video/react-native-video/commit/bfb76e6d15f88a7dc50c63958486375e142a26bd))
+* **android:** track selection parameter has change in last release. ([#3594](https://github.com/react-native-video/react-native-video/issues/3594)) ([d5c8b51](https://github.com/react-native-video/react-native-video/commit/d5c8b514a1af23fa473f32b434612feac46fd321))
+* fix getLicense function's type definition ([#3606](https://github.com/react-native-video/react-native-video/issues/3606)) ([89ae843](https://github.com/react-native-video/react-native-video/commit/89ae8438fa1d90700a462b117aa9af42780c6268))
+* inject onGetLicense prop properly for detect user defined or not ([#3608](https://github.com/react-native-video/react-native-video/issues/3608)) ([24c1aab](https://github.com/react-native-video/react-native-video/commit/24c1aab3f5ab6d2d753199ea16e01c993cc3ef7d))
+* **iOS:** fix iOS DRM header parser ([#3609](https://github.com/react-native-video/react-native-video/issues/3609)) ([c9a75f3](https://github.com/react-native-video/react-native-video/commit/c9a75f3cde82f55e612b9e2c30ca06db3093b283))
+* **ios:** fix PiP callback ([#3601](https://github.com/react-native-video/react-native-video/issues/3601)) ([bb9e7eb](https://github.com/react-native-video/react-native-video/commit/bb9e7eb5a5d68de1d8945be2f3fa089ca6ce2465))
+* **ios:** fix regression when playing source starting with ph:// ([#3630](https://github.com/react-native-video/react-native-video/issues/3630)) ([75d3707](https://github.com/react-native-video/react-native-video/commit/75d370742b95ddf0eb114ef48620e188e6fdfad1))
+* **ios:** fix startPosition, cropStart and cropEnd to handle float values correctly ([#3589](https://github.com/react-native-video/react-native-video/issues/3589)) ([36bd2e2](https://github.com/react-native-video/react-native-video/commit/36bd2e2d71dc6879d74b154ecc39ea7b27f4b565))
+* **iOS:** throw when content id defined with empty string ([#3612](https://github.com/react-native-video/react-native-video/issues/3612)) ([0983580](https://github.com/react-native-video/react-native-video/commit/098358076ddaba387284c1757a80bfcc5d82191f))
+* remove `setNativeProps` usage ([#3605](https://github.com/react-native-video/react-native-video/issues/3605)) ([0312afc](https://github.com/react-native-video/react-native-video/commit/0312afc8ea27f8c82ef7ba9fecbde23174e68671))
+
+
+### BREAKING CHANGES
+
+* **android:** move backBufferDurationMs from root props to bufferConfig
+
 # [6.0.0-beta.6](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.5...v6.0.0-beta.6) (2024-03-18)
 
 

diff --git a/android/src/main/java/androidx/media3/exoplayer/ima/ImaAdsLoader.java b/android/src/main/java/androidx/media3/exoplayer/ima/ImaAdsLoader.java
@@ -11,8 +11,6 @@
 import androidx.media3.exoplayer.source.ads.AdsLoader;
 import androidx.media3.exoplayer.source.ads.AdsMediaSource;
 
-import com.facebook.react.uimanager.ThemedReactContext;
-
 import java.io.IOException;
 
 public class ImaAdsLoader implements AdsLoader {

diff --git a/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java b/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java
@@ -14,8 +14,6 @@
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.common.ViewUtil;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
-import com.google.ads.interactivemedia.v3.api.AdError;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -459,14 +457,14 @@ public void receiveAdEvent(String event) {
         receiveEvent(EVENT_ON_RECEIVE_AD_EVENT, map);
     }
 
-    public void receiveAdErrorEvent(AdError error) {
+    public void receiveAdErrorEvent(String message, String code, String type) {
         WritableMap map = Arguments.createMap();
         map.putString("event", "ERROR");
 
         WritableMap dataMap = Arguments.createMap();
-        dataMap.putString("message", error.getMessage());
-        dataMap.putString("code", String.valueOf(error.getErrorCode()));
-        dataMap.putString("type", String.valueOf(error.getErrorType()));
+        dataMap.putString("message", message);
+        dataMap.putString("code", code);
+        dataMap.putString("type", type);
         map.putMap("data", dataMap);
 
         receiveEvent(EVENT_ON_RECEIVE_AD_EVENT, map);

diff --git a/android/src/main/java/com/brentvatne/common/toolbox/ReactBridgeUtils.kt b/android/src/main/java/com/brentvatne/common/toolbox/ReactBridgeUtils.kt
@@ -12,67 +12,47 @@ import java.util.HashMap
 
 object ReactBridgeUtils {
     @JvmStatic
-    fun safeGetString(map: ReadableMap?, key: String?, fallback: String?): String? {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getString(key) else fallback
-    }
+    fun safeGetString(map: ReadableMap?, key: String?, fallback: String?): String? =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getString(key) else fallback
 
     @JvmStatic
-    fun safeGetString(map: ReadableMap?, key: String?): String? {
-        return safeGetString(map, key, null)
-    }
+    fun safeGetString(map: ReadableMap?, key: String?): String? = safeGetString(map, key, null)
 
     @JvmStatic
-    fun safeGetDynamic(map: ReadableMap?, key: String?, fallback: Dynamic?): Dynamic? {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDynamic(key) else fallback
-    }
+    fun safeGetDynamic(map: ReadableMap?, key: String?, fallback: Dynamic?): Dynamic? =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDynamic(key) else fallback
 
     @JvmStatic
-    fun safeGetDynamic(map: ReadableMap?, key: String?): Dynamic? {
-        return safeGetDynamic(map, key, null)
-    }
+    fun safeGetDynamic(map: ReadableMap?, key: String?): Dynamic? = safeGetDynamic(map, key, null)
 
     @JvmStatic
-    fun safeGetBool(map: ReadableMap?, key: String?, fallback: Boolean): Boolean {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getBoolean(key) else fallback
-    }
+    fun safeGetBool(map: ReadableMap?, key: String?, fallback: Boolean): Boolean =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getBoolean(key) else fallback
 
     @JvmStatic
-    fun safeGetMap(map: ReadableMap?, key: String?): ReadableMap? {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getMap(key) else null
-    }
+    fun safeGetMap(map: ReadableMap?, key: String?): ReadableMap? = if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getMap(key) else null
 
     @JvmStatic
-    fun safeGetArray(map: ReadableMap?, key: String?): ReadableArray? {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getArray(key) else null
-    }
+    fun safeGetArray(map: ReadableMap?, key: String?): ReadableArray? = if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getArray(key) else null
 
     @JvmStatic
-    fun safeGetInt(map: ReadableMap?, key: String?, fallback: Int): Int {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getInt(key) else fallback
-    }
+    fun safeGetInt(map: ReadableMap?, key: String?, fallback: Int): Int =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getInt(key) else fallback
 
     @JvmStatic
-    fun safeGetInt(map: ReadableMap?, key: String?): Int {
-        return safeGetInt(map, key, 0)
-    }
+    fun safeGetInt(map: ReadableMap?, key: String?): Int = safeGetInt(map, key, 0)
 
     @JvmStatic
-    fun safeGetDouble(map: ReadableMap?, key: String?, fallback: Double): Double {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key) else fallback
-    }
+    fun safeGetDouble(map: ReadableMap?, key: String?, fallback: Double): Double =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key) else fallback
 
     @JvmStatic
-    fun safeGetDouble(map: ReadableMap?, key: String?): Double {
-        return safeGetDouble(map, key, 0.0)
-    }
+    fun safeGetDouble(map: ReadableMap?, key: String?): Double = safeGetDouble(map, key, 0.0)
 
-    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?, fallback: Float): Float {
-        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key).toFloat() else fallback
-    }
+    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?, fallback: Float): Float =
+        if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key).toFloat() else fallback
 
-    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?): Float {
-        return safeGetFloat(map, key, 0.0f)
-    }
+    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?): Float = safeGetFloat(map, key, 0.0f)
 
     /**
      * toStringMap converts a [ReadableMap] into a HashMap.

diff --git a/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
@@ -108,6 +108,10 @@ private void setVideoView() {
         }
     }
 
+    public boolean isPlaying() {
+        return player != null && player.isPlaying();
+    }
+
     public void setSubtitleStyle(SubtitleStyle style) {
         // ensure we reset subtile style before reapplying it
         subtitleLayout.setUserDefaultStyle();

diff --git a/android/src/main/java/com/brentvatne/exoplayer/FullScreenPlayerView.java b/android/src/main/java/com/brentvatne/exoplayer/FullScreenPlayerView.java
@@ -3,28 +3,73 @@
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
+import android.os.Handler;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.media3.ui.LegacyPlayerControlView;
 
+import com.brentvatne.common.toolbox.DebugLog;
+
+import java.lang.ref.WeakReference;
+
 @SuppressLint("PrivateResource")
 public class FullScreenPlayerView extends Dialog {
     private final LegacyPlayerControlView playerControlView;
     private final ExoPlayerView exoPlayerView;
+    private final ReactExoplayerView reactExoplayerView;
     private ViewGroup parent;
     private final FrameLayout containerView;
     private final OnBackPressedCallback onBackPressedCallback;
+    private final Handler mKeepScreenOnHandler;
+    private final Runnable mKeepScreenOnUpdater;
+
+    private static class KeepScreenOnUpdater implements Runnable {
+        private final static long UPDATE_KEEP_SCREEN_ON_FLAG_MS = 200;
+        private final WeakReference<FullScreenPlayerView> mFullscreenPlayer;
+
+        KeepScreenOnUpdater(FullScreenPlayerView player) {
+            mFullscreenPlayer = new WeakReference<>(player);
+        }
+
+        @Override
+        public void run() {
+            try {
+                FullScreenPlayerView fullscreenVideoPlayer = mFullscreenPlayer.get();
+                if (fullscreenVideoPlayer != null) {
+                    final Window window = fullscreenVideoPlayer.getWindow();
+                    if (window != null) {
+                        boolean isPlaying = fullscreenVideoPlayer.exoPlayerView.isPlaying();
+                        if (isPlaying) {
+                            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        } else {
+                            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    }
+                    fullscreenVideoPlayer.mKeepScreenOnHandler.postDelayed(this, UPDATE_KEEP_SCREEN_ON_FLAG_MS);
+                }
+            } catch (Exception ex) {
+                DebugLog.e("ExoPlayer Exception", "Failed to flag FLAG_KEEP_SCREEN_ON on fullscreeen.");
+                DebugLog.e("ExoPlayer Exception", ex.toString());
+            }
+        }
+    }
 
-    public FullScreenPlayerView(Context context, ExoPlayerView exoPlayerView, LegacyPlayerControlView playerControlView, OnBackPressedCallback onBackPressedCallback) {
+    public FullScreenPlayerView(Context context, ExoPlayerView exoPlayerView, ReactExoplayerView reactExoplayerView, LegacyPlayerControlView playerControlView, OnBackPressedCallback onBackPressedCallback) {
         super(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
         this.playerControlView = playerControlView;
         this.exoPlayerView = exoPlayerView;
+        this.reactExoplayerView = reactExoplayerView;
         this.onBackPressedCallback = onBackPressedCallback;
         containerView = new FrameLayout(context);
         setContentView(containerView, generateDefaultLayoutParams());
+
+        mKeepScreenOnUpdater = new KeepScreenOnUpdater(this);
+        mKeepScreenOnHandler = new Handler();
     }
 
     @Override
@@ -53,6 +98,7 @@ protected void onStart() {
 
     @Override
     protected void onStop() {
+        mKeepScreenOnHandler.removeCallbacks(mKeepScreenOnUpdater);
         containerView.removeView(exoPlayerView);
         parent.addView(exoPlayerView, generateDefaultLayoutParams());
 
@@ -70,6 +116,15 @@ protected void onStop() {
         super.onStop();
     }
 
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (reactExoplayerView.getPreventsDisplaySleepDuringVideoPlayback()) {
+            mKeepScreenOnHandler.post(mKeepScreenOnUpdater);
+        }
+    }
+
     private FrameLayout.LayoutParams generateDefaultLayoutParams() {
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT,