Commit 435669a9 authored by Dan Hodos's avatar Dan Hodos
Browse files

Extract method to add observer for progress update

parent f73b7a04

ios/RCTVideo.m

+11 −7
Changes for ios/RCTVideo.m: 11 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -124,6 +124,16 @@ static NSString *const timedMetadata = @"timedMetadata"; 
    return (kCMTimeRangeZero);

}



-(void)addPlayerTimeObserver

{

  const Float64 progressUpdateIntervalMS = _progressUpdateInterval / 1000;

  // @see endScrubbing in AVPlayerDemoPlaybackViewController.m of https://developer.apple.com/library/ios/samplecode/AVPlayerDemo/Introduction/Intro.html

  __weak RCTVideo *weakSelf = self;

  _timeObserver = [_player addPeriodicTimeObserverForInterval:CMTimeMakeWithSeconds(progressUpdateIntervalMS, NSEC_PER_SEC)

                                                        queue:NULL

                                                   usingBlock:^(CMTime time) { [weakSelf sendProgressUpdate]; }

                   ];

}



/* Cancels the previously registered time observer. */

-(void)removePlayerTimeObserver
@@ -283,13 +293,7 @@ static NSString *const timedMetadata = @"timedMetadata"; 
  [_player addObserver:self forKeyPath:playbackRate options:0 context:nil];

  _playbackRateObserverRegistered = YES;



  const Float64 progressUpdateIntervalMS = _progressUpdateInterval / 1000;

  // @see endScrubbing in AVPlayerDemoPlaybackViewController.m of https://developer.apple.com/library/ios/samplecode/AVPlayerDemo/Introduction/Intro.html

  __weak RCTVideo *weakSelf = self;

  _timeObserver = [_player addPeriodicTimeObserverForInterval:CMTimeMakeWithSeconds(progressUpdateIntervalMS, NSEC_PER_SEC)

                                                        queue:NULL

                                                   usingBlock:^(CMTime time) { [weakSelf sendProgressUpdate]; }

                   ];

  [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