From 4174d5a713b6193f3a6c523f7a0fe9465e221a5d Mon Sep 17 00:00:00 2001 From: Hampton Maxwell Date: Mon, 25 Jun 2018 11:43:51 -0700 Subject: [PATCH] Prevent onLoad event during seeking --- ios/RCTVideo.m | 127 ++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 65 deletions(-) diff --git a/ios/RCTVideo.m b/ios/RCTVideo.m index 8950a174..49893edb 100644 --- a/ios/RCTVideo.m +++ b/ios/RCTVideo.m @@ -25,6 +25,7 @@ static NSString *const timedMetadata = @"timedMetadata"; /* Required to publish events */ RCTEventDispatcher *_eventDispatcher; BOOL _playbackRateObserverRegistered; + BOOL _videoLoadStarted; bool _pendingSeek; float _pendingSeekTime; @@ -304,8 +305,8 @@ static NSString *const timedMetadata = @"timedMetadata"; [self addPlayerTimeObserver]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - //Perform on next run loop, otherwise onVideoLoadStart is nil - if(self.onVideoLoadStart) { + // Perform on next run loop, otherwise onVideoLoadStart is nil + if (self.onVideoLoadStart) { id uri = [source objectForKey:@"uri"]; id type = [source objectForKey:@"type"]; self.onVideoLoadStart(@{@"src": @{ @@ -316,6 +317,7 @@ static NSString *const timedMetadata = @"timedMetadata"; }); } }); + _videoLoadStarted = YES; } - (AVPlayerItem*)playerItemForSource:(NSDictionary *)source @@ -351,65 +353,60 @@ static NSString *const timedMetadata = @"timedMetadata"; - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context { - if (object == _playerItem) { - + if (object == _playerItem) { // When timeMetadata is read the event onTimedMetadata is triggered - if ([keyPath isEqualToString: timedMetadata]) - { - - - NSArray *items = [change objectForKey:@"new"]; - if (items && ![items isEqual:[NSNull null]] && items.count > 0) { - - NSMutableArray *array = [NSMutableArray new]; - for (AVMetadataItem *item in items) { - - NSString *value = item.value; - NSString *identifier = item.identifier; - - if (![value isEqual: [NSNull null]]) { - NSDictionary *dictionary = [[NSDictionary alloc] initWithObjects:@[value, identifier] forKeys:@[@"value", @"identifier"]]; - - [array addObject:dictionary]; - } - } - - self.onTimedMetadata(@{ - @"target": self.reactTag, - @"metadata": array - }); + if ([keyPath isEqualToString:timedMetadata]) { + NSArray *items = [change objectForKey:@"new"]; + if (items && ![items isEqual:[NSNull null]] && items.count > 0) { + NSMutableArray *array = [NSMutableArray new]; + for (AVMetadataItem *item in items) { + NSString *value = item.value; + NSString *identifier = item.identifier; + + if (![value isEqual: [NSNull null]]) { + NSDictionary *dictionary = [[NSDictionary alloc] initWithObjects:@[value, identifier] forKeys:@[@"value", @"identifier"]]; + + [array addObject:dictionary]; + } } + + self.onTimedMetadata(@{ + @"target": self.reactTag, + @"metadata": array + }); + } } - + if ([keyPath isEqualToString:statusKeyPath]) { // Handle player item status change. if (_playerItem.status == AVPlayerItemStatusReadyToPlay) { float duration = CMTimeGetSeconds(_playerItem.asset.duration); - + if (isnan(duration)) { duration = 0.0; } - + NSObject *width = @"undefined"; NSObject *height = @"undefined"; NSString *orientation = @"undefined"; - + if ([_playerItem.asset tracksWithMediaType:AVMediaTypeVideo].count > 0) { AVAssetTrack *videoTrack = [[_playerItem.asset tracksWithMediaType:AVMediaTypeVideo] objectAtIndex:0]; width = [NSNumber numberWithFloat:videoTrack.naturalSize.width]; height = [NSNumber numberWithFloat:videoTrack.naturalSize.height]; CGAffineTransform preferredTransform = [videoTrack preferredTransform]; - + if ((videoTrack.naturalSize.width == preferredTransform.tx - && videoTrack.naturalSize.height == preferredTransform.ty) - || (preferredTransform.tx == 0 && preferredTransform.ty == 0)) + && videoTrack.naturalSize.height == preferredTransform.ty) + || (preferredTransform.tx == 0 && preferredTransform.ty == 0)) { orientation = @"landscape"; - } else + } else { orientation = @"portrait"; + } } - - if(self.onVideoLoad) { + + if (self.onVideoLoad && _videoLoadStarted) { self.onVideoLoad(@{@"duration": [NSNumber numberWithFloat:duration], @"currentTime": [NSNumber numberWithFloat:CMTimeGetSeconds(_playerItem.currentTime)], @"canPlayReverse": [NSNumber numberWithBool:_playerItem.canPlayReverse], @@ -419,21 +416,21 @@ static NSString *const timedMetadata = @"timedMetadata"; @"canStepBackward": [NSNumber numberWithBool:_playerItem.canStepBackward], @"canStepForward": [NSNumber numberWithBool:_playerItem.canStepForward], @"naturalSize": @{ - @"width": width, - @"height": height, - @"orientation": orientation - }, + @"width": width, + @"height": height, + @"orientation": orientation + }, @"textTracks": [self getTextTrackInfo], @"target": self.reactTag}); - } - - + } + _videoLoadStarted = NO; + [self attachListeners]; [self applyModifiers]; - } else if(_playerItem.status == AVPlayerItemStatusFailed && self.onVideoError) { + } else if (_playerItem.status == AVPlayerItemStatusFailed && self.onVideoError) { self.onVideoError(@{@"error": @{@"code": [NSNumber numberWithInteger: _playerItem.error.code], @"domain": _playerItem.error.domain}, - @"target": self.reactTag}); + @"target": self.reactTag}); } } else if ([keyPath isEqualToString:playbackBufferEmptyKeyPath]) { _playerBufferEmpty = YES; @@ -446,28 +443,28 @@ static NSString *const timedMetadata = @"timedMetadata"; _playerBufferEmpty = NO; self.onVideoBuffer(@{@"isBuffering": @(NO), @"target": self.reactTag}); } - } else if (object == _playerLayer) { - if([keyPath isEqualToString:readyForDisplayKeyPath] && [change objectForKey:NSKeyValueChangeNewKey]) { - if([change objectForKey:NSKeyValueChangeNewKey] && self.onReadyForDisplay) { - self.onReadyForDisplay(@{@"target": self.reactTag}); - } + } else if (object == _playerLayer) { + if([keyPath isEqualToString:readyForDisplayKeyPath] && [change objectForKey:NSKeyValueChangeNewKey]) { + if([change objectForKey:NSKeyValueChangeNewKey] && self.onReadyForDisplay) { + self.onReadyForDisplay(@{@"target": self.reactTag}); + } } } else if (object == _player) { - if([keyPath isEqualToString:playbackRate]) { - if(self.onPlaybackRateChange) { - self.onPlaybackRateChange(@{@"playbackRate": [NSNumber numberWithFloat:_player.rate], - @"target": self.reactTag}); - } - if(_playbackStalled && _player.rate > 0) { - if(self.onPlaybackResume) { - self.onPlaybackResume(@{@"playbackRate": [NSNumber numberWithFloat:_player.rate], - @"target": self.reactTag}); - } - _playbackStalled = NO; - } + if([keyPath isEqualToString:playbackRate]) { + if(self.onPlaybackRateChange) { + self.onPlaybackRateChange(@{@"playbackRate": [NSNumber numberWithFloat:_player.rate], + @"target": self.reactTag}); } + if(_playbackStalled && _player.rate > 0) { + if(self.onPlaybackResume) { + self.onPlaybackResume(@{@"playbackRate": [NSNumber numberWithFloat:_player.rate], + @"target": self.reactTag}); + } + _playbackStalled = NO; + } + } } else { - [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; + [super observeValueForKeyPath:keyPath ofObject:object change:change context:context]; } }