Merge remote-tracking branch 'upstream/master' into feature/implement…

…-codegen-types
TheWidlarzGroup · Jan 25, 2024 · b7db238 · b7db238
2 parents 5287d69 + e63c7cb
commit b7db238
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -361,6 +361,7 @@ public void onHostDestroy() {
 
     public void cleanUpResources() {
         stopPlayback();
+        themedReactContext.removeLifecycleEventListener(this);
     }
 
     //BandwidthMeter.EventListener implementation
@@ -924,8 +925,6 @@ public void onAudioFocusChange(int focusChange) {
                 case AudioManager.AUDIOFOCUS_LOSS:
                     view.hasAudioFocus = false;
                     view.eventEmitter.audioFocusChanged(false);
-                    // FIXME this pause can cause issue if content doesn't have pause capability (can happen on live channel)
-                    view.pausePlayback();
                     view.audioManager.abandonAudioFocus(this);
                     break;
                 case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:

diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -76,7 +76,6 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi
     private static final String PROP_MIN_LOAD_RETRY_COUNT = "minLoadRetryCount";
     private static final String PROP_MAXIMUM_BIT_RATE = "maxBitRate";
     private static final String PROP_PLAY_IN_BACKGROUND = "playInBackground";
-    private static final String PROP_START_POSITION = "startPosition";
     private static final String PROP_CONTENT_START_TIME = "contentStartTime";
     private static final String PROP_DISABLE_FOCUS = "disableFocus";
     private static final String PROP_DISABLE_BUFFERING = "disableBuffering";
@@ -153,7 +152,7 @@ public void setDRM(final ReactExoplayerView videoView, @Nullable ReadableMap drm
     public void setSrc(final ReactExoplayerView videoView, @Nullable ReadableMap src) {
         Context context = videoView.getContext().getApplicationContext();
         String uriString = ReactBridgeUtils.safeGetString(src, PROP_SRC_URI, null);
-        int startPositionMs = ReactBridgeUtils.safeGetInt(src, PROP_START_POSITION, -1);
+        int startPositionMs = ReactBridgeUtils.safeGetInt(src, PROP_SRC_START_POSITION, -1);
         int cropStartMs = ReactBridgeUtils.safeGetInt(src, PROP_SRC_CROP_START, -1);
         int cropEndMs = ReactBridgeUtils.safeGetInt(src, PROP_SRC_CROP_END, -1);
         String extension = ReactBridgeUtils.safeGetString(src, PROP_SRC_TYPE, null);

diff --git a/ios/Video/Features/RCTPictureInPicture.swift b/ios/Video/Features/RCTPictureInPicture.swift
@@ -47,8 +47,10 @@ import React
         }
 
         func setupPipController(_ playerLayer: AVPlayerLayer?) {
+            guard let playerLayer else { return }
+            if !AVPictureInPictureController.isPictureInPictureSupported() { return }
             // Create new controller passing reference to the AVPlayerLayer
-            _pipController = AVPictureInPictureController(playerLayer: playerLayer!)
+            _pipController = AVPictureInPictureController(playerLayer: playerLayer)
             if #available(iOS 14.2, *) {
                 _pipController?.canStartPictureInPictureAutomaticallyFromInline = true
             }

diff --git a/ios/Video/Features/RCTVideoTVUtils.swift b/ios/Video/Features/RCTVideoTVUtils.swift
@@ -12,7 +12,7 @@ import Foundation
             var metadataGroups = [AVTimedMetadataGroup]()
 
             // Iterate over the defined chapters and build a timed metadata group object for each.
-            chapters.forEach { chapter in
+            for chapter in chapters {
                 metadataGroups.append(makeTimedMetadataGroup(for: chapter))
             }