expo-video 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -10,6 +10,14 @@
 
 ### 💡 Others
 
+## 1.1.4 — 2024-04-25
+
+_This version does not introduce any user-facing changes._
+
+## 1.1.3 — 2024-04-24
+
+_This version does not introduce any user-facing changes._
+
 ## 1.1.2 — 2024-04-24
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.1.2'
+version = '1.1.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.video"
   defaultConfig {
     versionCode 1
-    versionName '1.1.2'
+    versionName '1.1.4'
   }
 }
 

package/build/NativeVideoModule.d.ts

@@ -1,3 +1,6 @@
+/**
+ * @hidden
+ */
 declare const _default: any;
 export default _default;
 //# sourceMappingURL=NativeVideoModule.d.ts.map

package/build/NativeVideoModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeVideoModule.d.ts","sourceRoot":"","sources":["../src/NativeVideoModule.ts"],"names":[],"mappings":";AAEA,wBAAgD"}
+{"version":3,"file":"NativeVideoModule.d.ts","sourceRoot":"","sources":["../src/NativeVideoModule.ts"],"names":[],"mappings":"AAEA;;GAEG;;AACH,wBAAgD"}

package/build/NativeVideoModule.js

@@ -1,3 +1,6 @@
 import { requireNativeModule } from 'expo-modules-core';
+/**
+ * @hidden
+ */
 export default requireNativeModule('ExpoVideo');
 //# sourceMappingURL=NativeVideoModule.js.map

package/build/NativeVideoModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeVideoModule.js","sourceRoot":"","sources":["../src/NativeVideoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,eAAe,mBAAmB,CAAC,WAAW,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\nexport default requireNativeModule('ExpoVideo');\n"]}
+{"version":3,"file":"NativeVideoModule.js","sourceRoot":"","sources":["../src/NativeVideoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,eAAe,mBAAmB,CAAC,WAAW,CAAC,CAAC","sourcesContent":["import { requireNativeModule } from 'expo-modules-core';\n\n/**\n * @hidden\n */\nexport default requireNativeModule('ExpoVideo');\n"]}

package/build/index.d.ts

@@ -2,5 +2,5 @@ import Video from './NativeVideoModule';
 export { VideoView, isPictureInPictureSupported } from './VideoView';
 export { useVideoPlayer } from './VideoPlayer';
 export { Video };
-export { VideoSource, VideoPlayerEvents, VideoPlayerStatus, VideoContentFit, } from './VideoView.types';
+export * from './VideoView.types';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,CAAC;AACjB,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,CAAC;AACjB,cAAc,mBAAmB,CAAC"}

package/build/index.js

@@ -2,4 +2,5 @@ import Video from './NativeVideoModule';
 export { VideoView, isPictureInPictureSupported } from './VideoView';
 export { useVideoPlayer } from './VideoPlayer';
 export { Video };
+export * from './VideoView.types';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,CAAC","sourcesContent":["import Video from './NativeVideoModule';\n\nexport { VideoView, isPictureInPictureSupported } from './VideoView';\nexport { useVideoPlayer } from './VideoPlayer';\nexport { Video };\nexport {\n  VideoSource,\n  VideoPlayerEvents,\n  VideoPlayerStatus,\n  VideoContentFit,\n} from './VideoView.types';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,CAAC;AACjB,cAAc,mBAAmB,CAAC","sourcesContent":["import Video from './NativeVideoModule';\n\nexport { VideoView, isPictureInPictureSupported } from './VideoView';\nexport { useVideoPlayer } from './VideoPlayer';\nexport { Video };\nexport * from './VideoView.types';\n"]}

package/ios/VideoManager.swift

@@ -50,17 +50,42 @@ class VideoManager {
 
   // MARK: - Audio Session Management
 
-  private func switchToActiveAudioSession() throws {
+  internal func setAppropriateAudioSessionOrWarn() {
     let audioSession = AVAudioSession.sharedInstance()
-    try audioSession.setCategory(.playback, mode: .moviePlayback)
-    try audioSession.setActive(true)
-  }
+    var audioSessionCategoryOptions: AVAudioSession.CategoryOptions = []
+
+    let isAnyPlayerPlaying = videoPlayers.allObjects.contains { player in
+      player.isPlaying
+    }
+    let areAllPlayersMuted = videoPlayers.allObjects.allSatisfy { player in
+      player.isMuted
+    }
+    let needsPiPSupport = videoViews.allObjects.contains { view in
+      view.allowPictureInPicture
+    }
+    let shouldAllowMixing = !isAnyPlayerPlaying || areAllPlayersMuted
+    let isOutputtingAudio = !areAllPlayersMuted && isAnyPlayerPlaying
+    let shouldUpdateToAllowMixing = !audioSession.categoryOptions.contains(.mixWithOthers) && shouldAllowMixing
 
-  internal func switchToActiveAudioSessionOrWarn(warning: String) {
-    do {
-      try switchToActiveAudioSession()
-    } catch {
-      log.warn("\(warning). \(error.localizedDescription)")
+    if shouldAllowMixing {
+      audioSessionCategoryOptions.insert(.mixWithOthers)
+    }
+
+    if isOutputtingAudio || needsPiPSupport || shouldUpdateToAllowMixing {
+      do {
+        try audioSession.setCategory(.playback, mode: .moviePlayback, options: audioSessionCategoryOptions)
+      } catch {
+        log.warn("Failed to set audio session category. This might cause issues with audio playback and Picture in Picture. \(error.localizedDescription)")
+      }
+    }
+
+    // Make sure audio session is active if any video is playing
+    if isAnyPlayerPlaying {
+      do {
+        try audioSession.setActive(true)
+      } catch {
+        log.warn("Failed to activate the audio session. This might cause issues with audio playback. \(error.localizedDescription)")
+      }
     }
   }
 }

package/ios/VideoPlayer.swift

@@ -26,9 +26,7 @@ internal final class VideoPlayer: SharedRef<AVPlayer>, Hashable, VideoPlayerObse
   var staysActiveInBackground = false {
     didSet {
       if staysActiveInBackground {
-        VideoManager.shared.switchToActiveAudioSessionOrWarn(
-          warning: "Failed to set the audio session category. This might affect background playback functionality"
-        )
+        VideoManager.shared.setAppropriateAudioSessionOrWarn()
       }
     }
   }
@@ -60,6 +58,7 @@ internal final class VideoPlayer: SharedRef<AVPlayer>, Hashable, VideoPlayerObse
         self.emit(event: "volumeChange", arguments: newVolumeEvent.isMuted, oldVolumeEvent.isMuted)
       }
       pointer.isMuted = isMuted
+      VideoManager.shared.setAppropriateAudioSessionOrWarn()
     }
   }
 
@@ -125,6 +124,8 @@ internal final class VideoPlayer: SharedRef<AVPlayer>, Hashable, VideoPlayerObse
   func onIsPlayingChanged(player: AVPlayer, oldIsPlaying: Bool?, newIsPlaying: Bool) {
     self.emit(event: "playingChange", arguments: newIsPlaying, oldIsPlaying)
     isPlaying = newIsPlaying
+
+    VideoManager.shared.setAppropriateAudioSessionOrWarn()
   }
 
   func onRateChanged(player: AVPlayer, oldRate: Float?, newRate: Float) {

package/ios/VideoView.swift

@@ -6,7 +6,7 @@ import ExpoModulesCore
 public final class VideoView: ExpoView, AVPlayerViewControllerDelegate {
   lazy var playerViewController = AVPlayerViewController()
 
-  var player: VideoPlayer? {
+  weak var player: VideoPlayer? {
     didSet {
       playerViewController.player = player?.pointer
     }
@@ -24,13 +24,8 @@ public final class VideoView: ExpoView, AVPlayerViewControllerDelegate {
 
   var allowPictureInPicture: Bool = false {
     didSet {
-      if allowPictureInPicture {
-        // We need to set the audio session when the prop first changes to allow, because the PiP button in the native
-        // controls shows up automatically only when a correct audioSession category is set.
-        VideoManager.shared.switchToActiveAudioSessionOrWarn(
-          warning: "Failed to set the audio session category. This might break Picture in Picture functionality"
-        )
-      }
+      // PiP requires `.playback` audio session category in `.moviePlayback` mode
+      VideoManager.shared.setAppropriateAudioSessionOrWarn()
       playerViewController.allowsPictureInPicturePlayback = allowPictureInPicture
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-video",
   "title": "Expo Video",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "A cross-platform, performant video component for React Native and Expo with Web support",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -36,5 +36,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "f8f9d041c6467f325b58c7913e0f5ed1af102e11"
+  "gitHead": "f47e3af17a790a34b95fe10dda8383389e7d74e2"
 }

package/src/NativeVideoModule.ts

@@ -1,3 +1,6 @@
 import { requireNativeModule } from 'expo-modules-core';
 
+/**
+ * @hidden
+ */
 export default requireNativeModule('ExpoVideo');

package/src/index.ts

@@ -3,9 +3,4 @@ import Video from './NativeVideoModule';
 export { VideoView, isPictureInPictureSupported } from './VideoView';
 export { useVideoPlayer } from './VideoPlayer';
 export { Video };
-export {
-  VideoSource,
-  VideoPlayerEvents,
-  VideoPlayerStatus,
-  VideoContentFit,
-} from './VideoView.types';
+export * from './VideoView.types';