react-native-theoplayer 8.2.1 → 8.3.0

package/CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [8.3.0] - 24-09-30
+
+### Added
+
+- Added the option to specify the AVAudioSession mode for iOS (moviePlayback versus spokenAudio).
+
+## [8.2.2] - 24-09-28
+
+- Fixed a build issue on iOS for applications that run without the GOOGLE_IMA feature flag
+
 ## [8.2.1] - 24-09-27
 
 ### Fixed

package/android/build.gradle

@@ -106,6 +106,10 @@ repositories {
   maven { url "https://maven.theoplayer.com/releases" }
 }
 
+// The minimum supported THEOplayer version is 8.1.0
+def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[8.1.0, 9.0.0)')
+def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.1.0, 9.0.0)')
+
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
@@ -114,10 +118,6 @@ dependencies {
   implementation "androidx.core:core-ktx:${safeExtGet('corektxVersion', '1.10.1')}"
   implementation "com.google.code.gson:gson:2.11.0"
 
-  // The minimum supported THEOplayer version is 8.1.0
-  def theoplayer_sdk_version = safeExtGet('THEOplayer_sdk', '[8.1.0, 9.0.0)')
-  def theoplayer_mediasession_version = safeExtGet('THEOplayer_mediasession', '[8.1.0, 9.0.0)')
-
   println("Using THEOplayer (${versionString(theoplayer_sdk_version)})")
   implementation "com.theoplayer.theoplayer-sdk-android:core:${theoplayer_sdk_version}"
   implementation "com.theoplayer.theoplayer-sdk-android:ads-wrapper:8.0.0"
@@ -151,3 +151,13 @@ dependencies {
     compileOnly "com.theoplayer.theoplayer-sdk-android:integration-cast:${theoplayer_sdk_version}"
   }
 }
+
+// Make sure to align all ads extension versions
+configurations.configureEach {
+  resolutionStrategy {
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads:${theoplayer_sdk_version}"
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads-ima:${theoplayer_sdk_version}"
+    force "com.theoplayer.theoplayer-sdk-android:integration-ads-dai:${theoplayer_sdk_version}"
+  }
+}
+

package/ios/THEOplayerRCTPlayerAPI.swift

@@ -224,6 +224,9 @@ class THEOplayerRCTPlayerAPI: NSObject, RCTBridgeModule {
         var backgroundAudio = BackgroundAudioConfig()
         backgroundAudio.enabled = configDict["enabled"] as? Bool ?? false
         backgroundAudio.shouldResumeAfterInterruption = configDict["shouldResumeAfterInterruption"] as? Bool ?? false
+        if let audioSessionModeString = configDict["audioSessionMode"] as? String {
+            backgroundAudio.audioSessionMode = THEOplayerRCTTypeUtils.audioSessionModeFromString(audioSessionModeString)
+        }
         return backgroundAudio
     }
 

package/ios/THEOplayerRCTTypeUtils.swift

@@ -1,6 +1,7 @@
 // THEOplayerRCTTypeUtils.swift
 
 import Foundation
+import AVKit
 import THEOplayerSDK
 
 let NAN_VALUE: Double = -1.0
@@ -111,6 +112,17 @@ class THEOplayerRCTTypeUtils {
             return AdIntegrationKind.custom
         }
     }
+    
+    class func audioSessionModeFromString(_ audioSessionModeString: String) -> AVAudioSession.Mode {
+        switch audioSessionModeString {
+        case "moviePlayback":
+            return .moviePlayback
+        case "spokenAudio":
+            return .spokenAudio
+        default:
+            return .moviePlayback
+        }
+    }
 
 #if os(iOS)
     class func cacheStatusToString(_ status: CacheStatus) -> String {

package/ios/THEOplayerRCTView.swift

@@ -36,6 +36,7 @@ public class THEOplayerRCTView: UIView {
     var backgroundAudioConfig = BackgroundAudioConfig() {
           didSet {
               self.updateInterruptionNotifications()
+              self.updateAVAudioSessionMode()
           }
       }
 

package/ios/ads/THEOplayerRCTView+AdsConfig.swift

@@ -9,7 +9,7 @@ import GoogleInteractiveMediaAds
 
 struct AdsConfig {
     var adSUIEnabled: Bool = true
-    var adsImaConfig = AdsImaConfig()
+    var adsImaConfig = AdsImaConfig(maxRedirects: 4, enableDebugMode: false)
     var allowedMimeTypes: [String]?
 }
 
@@ -20,7 +20,21 @@ struct AdsImaConfig {
     var featureFlags: [String:String]?
     var autoPlayAdBreaks: Bool?
     var sessionID: String?
-    var bitrate: Int = kIMAAutodetectBitrate
+    var bitrate: Int
+    
+    init(maxRedirects: UInt, enableDebugMode: Bool, ppid: String? = nil, featureFlags: [String : String]? = nil, autoPlayAdBreaks: Bool? = nil, sessionID: String? = nil, bitrate: Int? = -1) {
+        self.maxRedirects = maxRedirects
+        self.enableDebugMode = enableDebugMode
+        self.ppid = ppid
+        self.featureFlags = featureFlags
+        self.autoPlayAdBreaks = autoPlayAdBreaks
+        self.sessionID = sessionID
+#if canImport(THEOplayerGoogleIMAIntegration)
+        self.bitrate = bitrate ?? kIMAAutodetectBitrate
+#else
+        self.bitrate = bitrate ?? -1
+#endif
+    }
 }
 
 #if os(iOS)
@@ -50,7 +64,9 @@ extension THEOplayerRCTView {
                 if let enableDebugMode = adsImaConfig["enableDebugMode"] as? Bool {
                     self.adsConfig.adsImaConfig.enableDebugMode = enableDebugMode
                 }
-                self.adsConfig.adsImaConfig.bitrate = adsImaConfig["bitrate"] as? Int ?? kIMAAutodetectBitrate
+                if let bitrate = adsImaConfig["bitrate"] as? Int {
+                    self.adsConfig.adsImaConfig.bitrate = bitrate
+                }
             }
         }
     }

package/ios/backgroundAudio/THEOplayerRCTView+BackgroundAudioConfig.swift

@@ -3,10 +3,12 @@
 import Foundation
 import THEOplayerSDK
 import AVFAudio
+import AVKit
 
 struct BackgroundAudioConfig {
     var enabled: Bool = false
     var shouldResumeAfterInterruption: Bool = false
+    var audioSessionMode: AVAudioSession.Mode = .moviePlayback
 }
 
 extension THEOplayerRCTView: BackgroundPlaybackDelegate {
@@ -46,6 +48,17 @@ extension THEOplayerRCTView: BackgroundPlaybackDelegate {
         }
     }
     
+    func updateAVAudioSessionMode() {
+        do {
+            THEOplayer.automaticallyManageAudioSession = (self.backgroundAudioConfig.audioSessionMode == .moviePlayback)
+            try AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, mode: self.backgroundAudioConfig.audioSessionMode)
+            if self.backgroundAudioConfig.audioSessionMode != .moviePlayback {
+                print("[NATIVE] AVAudioSession mode updated to \(self.backgroundAudioConfig.audioSessionMode.rawValue)")
+            }
+        } catch {
+            print("[NATIVE] Unable to update AVAudioSession mode to \(self.backgroundAudioConfig.audioSessionMode.rawValue): ", error)
+        }
+    }
     
     @objc func handleInterruption(notification: Notification) {
         guard let userInfo = notification.userInfo,

package/lib/commonjs/api/backgroundAudio/BackgroundAudioConfiguration.js

@@ -1,2 +1,17 @@
 "use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AudioSessionMode = void 0;
+/**
+ * Describes the configuration of the background audio feature.
+ *
+ * @public
+ */
+let AudioSessionMode = exports.AudioSessionMode = /*#__PURE__*/function (AudioSessionMode) {
+  AudioSessionMode["MOVIE_PLAYBACK"] = "moviePlayback";
+  AudioSessionMode["SPOKEN_AUDIO"] = "spokenAudio";
+  return AudioSessionMode;
+}({});
 //# sourceMappingURL=BackgroundAudioConfiguration.js.map

package/lib/commonjs/api/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["api/backgroundAudio/BackgroundAudioConfiguration.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["AudioSessionMode","exports"],"sourceRoot":"../../../../src","sources":["api/backgroundAudio/BackgroundAudioConfiguration.ts"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AAJA,IA8BYA,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,0BAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAA,OAAhBA,gBAAgB;AAAA","ignoreList":[]}

package/lib/module/api/backgroundAudio/BackgroundAudioConfiguration.js

@@ -1,2 +1,12 @@
+/**
+ * Describes the configuration of the background audio feature.
+ *
+ * @public
+ */
 
+export let AudioSessionMode = /*#__PURE__*/function (AudioSessionMode) {
+  AudioSessionMode["MOVIE_PLAYBACK"] = "moviePlayback";
+  AudioSessionMode["SPOKEN_AUDIO"] = "spokenAudio";
+  return AudioSessionMode;
+}({});
 //# sourceMappingURL=BackgroundAudioConfiguration.js.map

package/lib/module/api/backgroundAudio/BackgroundAudioConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["api/backgroundAudio/BackgroundAudioConfiguration.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["AudioSessionMode"],"sourceRoot":"../../../../src","sources":["api/backgroundAudio/BackgroundAudioConfiguration.ts"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AA0BA,WAAYA,gBAAgB,0BAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAA,OAAhBA,gBAAgB;AAAA","ignoreList":[]}

package/lib/typescript/api/backgroundAudio/BackgroundAudioConfiguration.d.ts

@@ -11,11 +11,22 @@ export interface BackgroundAudioConfiguration {
      */
     readonly enabled?: boolean;
     /**
-     * Whether background audio should be resumed after an interruption (e.g. incoming call ended).
+     * Whether background audio should be resumed after an interruption on iOS (e.g. incoming call).
      *
      * @defaultValue `false`
-     * @remark Applies to iOS only, impacting behaviour for handling interruptions while on the lockscreen.
+     * @remark Applies to iOS only, impacting behaviour for handling interruptions.
      */
     readonly shouldResumeAfterInterruption?: boolean;
+    /**
+     * Specify the mode for the native iOS AVAudioSession.
+     *
+     * @defaultValue `AudioSessionMode.MOVIE_PLAYBACK`
+     * @remark Applies to iOS only, impacting behaviour for handling interruptions.
+     */
+    readonly audioSessionMode?: AudioSessionMode;
+}
+export declare enum AudioSessionMode {
+    MOVIE_PLAYBACK = "moviePlayback",
+    SPOKEN_AUDIO = "spokenAudio"
 }
 //# sourceMappingURL=BackgroundAudioConfiguration.d.ts.map

package/lib/typescript/api/backgroundAudio/BackgroundAudioConfiguration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BackgroundAudioConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/api/backgroundAudio/BackgroundAudioConfiguration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC;CAClD"}
+{"version":3,"file":"BackgroundAudioConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/api/backgroundAudio/BackgroundAudioConfiguration.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,QAAQ,CAAC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IAEjD;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CAC9C;AAED,oBAAY,gBAAgB;IAC1B,cAAc,kBAAkB;IAChC,YAAY,gBAAgB;CAC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "8.2.1",
+  "version": "8.3.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/api/backgroundAudio/BackgroundAudioConfiguration.ts

@@ -12,10 +12,23 @@ export interface BackgroundAudioConfiguration {
   readonly enabled?: boolean;
 
   /**
-   * Whether background audio should be resumed after an interruption (e.g. incoming call ended).
+   * Whether background audio should be resumed after an interruption on iOS (e.g. incoming call).
    *
    * @defaultValue `false`
-   * @remark Applies to iOS only, impacting behaviour for handling interruptions while on the lockscreen.
+   * @remark Applies to iOS only, impacting behaviour for handling interruptions.
    */
   readonly shouldResumeAfterInterruption?: boolean;
+
+  /**
+   * Specify the mode for the native iOS AVAudioSession.
+   *
+   * @defaultValue `AudioSessionMode.MOVIE_PLAYBACK`
+   * @remark Applies to iOS only, impacting behaviour for handling interruptions.
+   */
+  readonly audioSessionMode?: AudioSessionMode;
+}
+
+export enum AudioSessionMode {
+  MOVIE_PLAYBACK = 'moviePlayback',
+  SPOKEN_AUDIO = 'spokenAudio'
 }