react-native-unified-player 0.6.0 → 0.6.3

package/android/src/main/java/com/unifiedplayer/UnifiedPlayerView.kt

@@ -57,6 +57,7 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
     private var thumbnailUrl: String? = null
     private var autoplay: Boolean = true
     private var loop: Boolean = false
+    private var speed: Float = 1.0f // Default playback speed
     private var textureView: android.view.TextureView
     private var thumbnailImageView: ImageView? = null
     internal var player: ExoPlayer? = null
@@ -157,6 +158,11 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
                             sendEvent(EVENT_COMPLETE, Arguments.createMap())
                         } else {
                             Log.d(TAG, "Looping enabled, not sending completion event")
+                            // Ensure playback speed is preserved after loop
+                            if (speed != 1.0f && player != null) {
+                                player?.setPlaybackSpeed(speed)
+                                Log.d(TAG, "Restored playback speed: $speed after loop")
+                            }
                         }
                     }
                     Player.STATE_BUFFERING -> {
@@ -175,6 +181,11 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
                     Log.d(TAG, "ExoPlayer is now playing")
                     // Hide thumbnail when video starts playing
                     thumbnailImageView?.visibility = View.GONE
+                    // Ensure playback speed is preserved when playback resumes (e.g., after loop)
+                    if (speed != 1.0f) {
+                        player?.setPlaybackSpeed(speed)
+                        Log.d(TAG, "Restored playback speed: $speed when playback resumed")
+                    }
                     sendEvent(EVENT_RESUMED, Arguments.createMap())
                     sendEvent(EVENT_PLAYING, Arguments.createMap())
                 } else {
@@ -248,8 +259,12 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
             player?.prepare()
             player?.playWhenReady = autoplay && !isPaused
             player?.repeatMode = if (loop) Player.REPEAT_MODE_ONE else Player.REPEAT_MODE_OFF
+            // Apply playback speed if set
+            if (speed != 1.0f) {
+                player?.setPlaybackSpeed(speed)
+            }
 
-            Log.d(TAG, "ExoPlayer configured with URL: $url, autoplay: $autoplay, loop: $loop, isPaused: $isPaused")
+            Log.d(TAG, "ExoPlayer configured with URL: $url, autoplay: $autoplay, loop: $loop, isPaused: $isPaused, speed: $speed")
             sendEvent(EVENT_LOAD_START, Arguments.createMap())
 
         } catch (e: Exception) {
@@ -436,6 +451,10 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
     fun play() {
         Log.d(TAG, "Play method called")
         player?.playWhenReady = true
+        // Ensure playback speed is applied when playing
+        if (speed != 1.0f) {
+            player?.setPlaybackSpeed(speed)
+        }
     }
 
     fun pause() {
@@ -455,8 +474,9 @@ class UnifiedPlayerView(context: Context) : FrameLayout(context) {
         } ?: Log.e(TAG, "Cannot seek: player is null")
     }
 
-    fun setSpeed(speed: Float) {
-        Log.d(TAG, "SetSpeed method called with speed: $speed")
+    fun setSpeed(speedValue: Float) {
+        Log.d(TAG, "SetSpeed method called with speed: $speedValue")
+        speed = speedValue // Store the speed value
         player?.let {
             it.setPlaybackSpeed(speed)
             Log.d(TAG, "Playback speed set to: $speed")

package/ios/UnifiedPlayerModule.h

@@ -1,6 +1,6 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridgeModule.h>
-#import <MobileVLCKit/MobileVLCKit.h> // Import MobileVLCKit
+#import <AVFoundation/AVFoundation.h> // Import MobileVLCKit
 
 // Forward declaration for UnifiedPlayerUIView
 @class UnifiedPlayerUIView;

package/ios/UnifiedPlayerViewManager.m

@@ -62,13 +62,13 @@
         _autoplay = YES;
         _loop = NO;
         _isFullscreen = NO;
-
+        
         // Add notification observers
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(appDidEnterBackground:)
                                                      name:UIApplicationDidEnterBackgroundNotification
                                                    object:nil];
-
+        
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(appDidBecomeActive:)
                                                      name:UIApplicationDidBecomeActiveNotification
@@ -121,8 +121,8 @@
 - (void)sendProgressEvent:(float)currentTime duration:(float)duration {
     if (self.onProgress) {
         self.onProgress(@{
-            @"currentTime": @(currentTime),
-            @"duration": @(duration)
+        @"currentTime": @(currentTime),
+        @"duration": @(duration)
         });
     }
 }
@@ -394,15 +394,20 @@
 
 - (void)play {
     if (_playerItem && _playerItem.status == AVPlayerItemStatusReadyToPlay) {
-        // Apply speed if set
-        if (_speed > 0 && _speed != 1.0f) {
-            float validSpeed = MAX(0.25f, MIN(4.0f, _speed));
-            _player.rate = validSpeed;
-        } else {
-            _player.rate = 1.0f;
-        }
-        
         [_player play];
+        
+        // Apply speed AFTER play() is called to ensure it's not reset
+        // Use a small delay to ensure play() has started
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (self->_speed > 0 && self->_speed != 1.0f) {
+                float validSpeed = MAX(0.25f, MIN(4.0f, self->_speed));
+                self->_player.rate = validSpeed;
+                RCTLogInfo(@"[UnifiedPlayerViewManager] Applied speed: %f after play", validSpeed);
+            } else {
+                self->_player.rate = 1.0f;
+            }
+        });
+        
         [self sendEvent:@"onPlaying" body:@{}];
         RCTLogInfo(@"[UnifiedPlayerViewManager] play called");
     } else {
@@ -490,13 +495,33 @@
 #pragma mark - Notifications
 
 - (void)playerItemDidReachEnd:(NSNotification *)notification {
-    RCTLogInfo(@"[UnifiedPlayerViewManager] Video ended, loop: %@", _loop ? @"YES" : @"NO");
-    
+    RCTLogInfo(@"[UnifiedPlayerViewManager] Video ended, loop: %@, speed: %f", _loop ? @"YES" : @"NO", _speed);
+        
     if (_loop) {
+        // Store current speed before seeking
+        float savedSpeed = _speed;
+        
         // Seek to beginning and play again
-        [_player seekToTime:kCMTimeZero completionHandler:^(BOOL finished) {
-            if (finished) {
-                [self->_player play];
+            [_player seekToTime:kCMTimeZero completionHandler:^(BOOL finished) {
+                if (finished) {
+                    [self->_player play];
+                // Restore playback speed AFTER play() is called
+                // Use multiple attempts to ensure speed is set
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.15 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    if (savedSpeed > 0 && savedSpeed != 1.0f) {
+                        float validSpeed = MAX(0.25f, MIN(4.0f, savedSpeed));
+                        self->_player.rate = validSpeed;
+                        RCTLogInfo(@"[UnifiedPlayerViewManager] Restored speed: %f for loop (attempt 1)", validSpeed);
+                        
+                        // Double-check after a bit more time
+                        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                            if (self->_player.rate != validSpeed && self->_player.rate > 0) {
+                                self->_player.rate = validSpeed;
+                                RCTLogInfo(@"[UnifiedPlayerViewManager] Restored speed: %f for loop (attempt 2)", validSpeed);
+                            }
+                        });
+                    }
+                });
                 RCTLogInfo(@"[UnifiedPlayerViewManager] Looped video - restarted from beginning");
             }
         }];
@@ -530,10 +555,75 @@
 #pragma mark - Recording (Placeholder - can be implemented later)
 
 - (void)captureFrameWithCompletion:(void (^)(NSString * _Nullable base64String, NSError * _Nullable error))completion {
-    // Placeholder implementation
-    if (completion) {
-        completion(nil, [NSError errorWithDomain:@"UnifiedPlayer" code:1 userInfo:@{NSLocalizedDescriptionKey: @"Not implemented"}]);
+    if (!completion) {
+        return;
     }
+    
+    if (!_playerItem || _playerItem.status != AVPlayerItemStatusReadyToPlay) {
+        completion(nil, [NSError errorWithDomain:@"UnifiedPlayer" 
+                                             code:1 
+                                         userInfo:@{NSLocalizedDescriptionKey: @"Player item not ready"}]);
+        return;
+    }
+    
+    if (!_playerLayer) {
+        completion(nil, [NSError errorWithDomain:@"UnifiedPlayer" 
+                                             code:2 
+                                         userInfo:@{NSLocalizedDescriptionKey: @"Player layer not available"}]);
+        return;
+    }
+    
+    // Use AVAssetImageGenerator to capture the current frame
+    AVAssetImageGenerator *imageGenerator = [[AVAssetImageGenerator alloc] initWithAsset:_playerItem.asset];
+    imageGenerator.appliesPreferredTrackTransform = YES;
+    imageGenerator.requestedTimeToleranceBefore = kCMTimeZero;
+    imageGenerator.requestedTimeToleranceAfter = kCMTimeZero;
+    
+    CMTime currentTime = _player.currentTime;
+    if (!CMTIME_IS_VALID(currentTime)) {
+        currentTime = kCMTimeZero;
+    }
+    
+    // Generate the image
+    [imageGenerator generateCGImagesAsynchronouslyForTimes:@[[NSValue valueWithCMTime:currentTime]]
+                                          completionHandler:^(CMTime requestedTime, CGImageRef image, CMTime actualTime, AVAssetImageGeneratorResult result, NSError *error) {
+                if (error) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(nil, error);
+            });
+            return;
+        }
+        
+        if (result != AVAssetImageGeneratorSucceeded || !image) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(nil, [NSError errorWithDomain:@"UnifiedPlayer" 
+                                                     code:3 
+                                                 userInfo:@{NSLocalizedDescriptionKey: @"Failed to generate image"}]);
+            });
+            return;
+        }
+        
+        // Convert CGImage to UIImage
+        UIImage *uiImage = [UIImage imageWithCGImage:image];
+        
+        // Convert to JPEG data
+        NSData *imageData = UIImageJPEGRepresentation(uiImage, 0.8);
+        if (!imageData) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                completion(nil, [NSError errorWithDomain:@"UnifiedPlayer" 
+                                                     code:4 
+                                                 userInfo:@{NSLocalizedDescriptionKey: @"Failed to convert image to JPEG"}]);
+            });
+            return;
+        }
+        
+        // Encode to base64
+        NSString *base64String = [imageData base64EncodedStringWithOptions:0];
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            completion(base64String, nil);
+        });
+    }];
 }
 
 - (void)captureFrameForRecording {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unified-player",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "description": "Unified Player",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -107,7 +107,11 @@
     "git": {
       "commitMessage": "chore: release ${version}",
       "tagName": "v${version}",
-      "requireCleanWorkingDir": false
+      "requireCleanWorkingDir": false,
+      "push": true,
+      "pushArgs": [
+        "--force-with-lease"
+      ]
     },
     "npm": {
       "publish": true,