@granite-js/video 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @granite-js/video
 
+## 3.0.2
+
+### Patch Changes
+
+- f7bd69b: Forward iOS video playback options before source loading and restore them when Fabric reuses a view. The default iOS video provider now honors the progress update interval.
+
+## 3.0.1
+
 ## 3.0.0
 
 ## 2.5.5

package/GraniteVideo.podspec

@@ -67,6 +67,16 @@ Pod::Spec.new do |s|
 
   s.frameworks = ["AVFoundation", "AVKit", "CoreMedia"]
 
+  s.test_spec 'ProviderTests' do |test_spec|
+    test_spec.source_files = 'native-tests/ios/**/*.{m,mm,swift}'
+    test_spec.requires_app_host = true
+    test_spec.frameworks = ['XCTest']
+    test_spec.pod_target_xcconfig = {
+      'HEADER_SEARCH_PATHS' => '$(inherited) "$(PODS_CONFIGURATION_BUILD_DIR)/ReactCodegen/ReactCodegen.framework/Headers"',
+      'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => use_default_provider ? '$(inherited) GRANITE_VIDEO_DEFAULT_PROVIDER' : '$(inherited)'
+    }
+  end
+
   # React Native modules dependencies (Fabric/TurboModule)
   install_modules_dependencies(s)
 end

package/ios/GraniteVideoProvider.swift

@@ -176,6 +176,10 @@ import AVFoundation
     @objc var duration: Double { get }
     @objc var isPlaying: Bool { get }
 
+    // Optional - Progress
+    /// Progress callback interval in milliseconds. Non-positive values use the provider default.
+    @objc optional func setProgressUpdateInterval(_ interval: Double)
+
     // Optional - Volume
     @objc optional func setVolume(_ volume: Float)
     @objc optional func setMuted(_ muted: Bool)

package/ios/GraniteVideoView.mm

@@ -36,6 +36,8 @@ using namespace facebook::react;
     BOOL _muted;
     BOOL _repeat;
     NSString *_resizeMode;
+    BOOL _needsPlaybackPropsReapply;
+    BOOL _needsMixWithOthersReapply;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -56,6 +58,8 @@ using namespace facebook::react;
         _muted = NO;
         _repeat = NO;
         _resizeMode = @"contain";
+        _needsPlaybackPropsReapply = YES;
+        _needsMixWithOthersReapply = NO;
 
         // Create provider from registry
         _provider = [[GraniteVideoRegistry shared] createProvider];
@@ -95,6 +99,23 @@ using namespace facebook::react;
     const auto &oldViewProps = *std::static_pointer_cast<GraniteVideoViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<GraniteVideoViewProps const>(props);
 
+    // Apply options before loading: providers may configure audio, observers and playback in loadSource.
+    if (_needsMixWithOthersReapply || newViewProps.mixWithOthers != oldViewProps.mixWithOthers) {
+        [self updateMixWithOthers:[NSString stringWithUTF8String:newViewProps.mixWithOthers.c_str()]];
+    }
+    if (_needsPlaybackPropsReapply || newViewProps.progressUpdateInterval != oldViewProps.progressUpdateInterval) {
+        if ([_provider respondsToSelector:@selector(setProgressUpdateInterval:)]) {
+            [_provider setProgressUpdateInterval:newViewProps.progressUpdateInterval];
+        }
+    }
+    if (_needsPlaybackPropsReapply || newViewProps.automaticallyWaitsToMinimizeStalling != oldViewProps.automaticallyWaitsToMinimizeStalling) {
+        if ([_provider respondsToSelector:@selector(setAutomaticallyWaitsToMinimizeStalling:)]) {
+            [_provider setAutomaticallyWaitsToMinimizeStalling:newViewProps.automaticallyWaitsToMinimizeStalling];
+        }
+    }
+    _needsPlaybackPropsReapply = NO;
+    _needsMixWithOthersReapply = NO;
+
     // Source
     if (newViewProps.source.uri != oldViewProps.source.uri ||
         newViewProps.source.type != oldViewProps.source.type) {
@@ -198,13 +219,6 @@ using namespace facebook::react;
         }
     }
 
-    // Automatically Waits to Minimize Stalling
-    if (newViewProps.automaticallyWaitsToMinimizeStalling != oldViewProps.automaticallyWaitsToMinimizeStalling) {
-        if ([_provider respondsToSelector:@selector(setAutomaticallyWaitsToMinimizeStalling:)]) {
-            [_provider setAutomaticallyWaitsToMinimizeStalling:newViewProps.automaticallyWaitsToMinimizeStalling];
-        }
-    }
-
     // Allows External Playback
     if (newViewProps.allowsExternalPlayback != oldViewProps.allowsExternalPlayback) {
         if ([_provider respondsToSelector:@selector(setAllowsExternalPlayback:)]) {
@@ -281,6 +295,19 @@ using namespace facebook::react;
     }
 }
 
+- (void)updateMixWithOthers:(NSString *)mode
+{
+    if ([_provider respondsToSelector:@selector(setMixWithOthers:)]) {
+        GraniteVideoMixWithOthers value = GraniteVideoMixWithOthersInherit;
+        if ([mode isEqualToString:@"mix"]) {
+            value = GraniteVideoMixWithOthersMix;
+        } else if ([mode isEqualToString:@"duck"]) {
+            value = GraniteVideoMixWithOthersDuck;
+        }
+        [_provider setMixWithOthers:value];
+    }
+}
+
 - (void)updateDrmConfig:(const GraniteVideoViewDrmStruct &)drm
 {
     if (drm.type.empty()) {
@@ -665,6 +692,9 @@ using namespace facebook::react;
 {
     [super prepareForRecycle];
     [_provider unload];
+    // The provider survives recycling, while Fabric resets the old props to defaults.
+    _needsPlaybackPropsReapply = YES;
+    _needsMixWithOthersReapply = YES;
     _props = std::make_shared<const GraniteVideoViewProps>();
 }
 

package/ios/Providers/AVPlayerProvider.swift

@@ -34,6 +34,7 @@ private class AVPlayerContainerView: UIView {
     private var playerView: AVPlayerContainerView?
     private var playerItem: AVPlayerItem?
     private var timeObserver: Any?
+    private var progressInterval: Double = 0.25
     private var pipController: AVPictureInPictureController?
 
     private var shouldRepeat: Bool = false
@@ -242,11 +243,7 @@ private class AVPlayerContainerView: UIView {
             player.seek(to: seekTime)
         }
 
-        // Add time observer for progress
-        let interval = CMTime(seconds: 0.25, preferredTimescale: CMTimeScale(NSEC_PER_SEC))
-        timeObserver = player.addPeriodicTimeObserver(forInterval: interval, queue: .main) { [weak self] _ in
-            self?.handleProgressUpdate()
-        }
+        updateProgressObserver()
 
         // Apply settings
         player.isMuted = isMuted
@@ -375,6 +372,11 @@ private class AVPlayerContainerView: UIView {
         playerItem?.preferredForwardBufferDuration = duration
     }
 
+    @objc public func setProgressUpdateInterval(_ interval: Double) {
+        progressInterval = interval.isFinite && interval > 0 ? interval / 1000.0 : 0.25
+        updateProgressObserver()
+    }
+
     @objc public func setAutomaticallyWaitsToMinimizeStalling(_ waits: Bool) {
         automaticallyWaits = waits
         player.automaticallyWaitsToMinimizeStalling = waits
@@ -400,6 +402,17 @@ private class AVPlayerContainerView: UIView {
 
     // MARK: - Private Methods
 
+    private func updateProgressObserver() {
+        guard playerItem != nil else { return }
+        if let observer = timeObserver {
+            player.removeTimeObserver(observer)
+        }
+        let interval = CMTime(seconds: progressInterval, preferredTimescale: CMTimeScale(NSEC_PER_SEC))
+        timeObserver = player.addPeriodicTimeObserver(forInterval: interval, queue: .main) { [weak self] _ in
+            self?.handleProgressUpdate()
+        }
+    }
+
     private func unloadPlayerItem() {
         if let observer = timeObserver {
             player.removeTimeObserver(observer)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/video",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "Pluggable video component for React Native with provider selection",
   "type": "module",
   "main": "./dist/module/index.js",
@@ -19,6 +19,7 @@
     "dist",
     "android",
     "ios",
+    "native-tests/ios",
     "*.podspec",
     "react-native.config.js",
     "!example/**",