Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting progressUpdateInterval to work on iOS #800

Merged
merged 3 commits into from
May 29, 2018
Merged

Allow setting progressUpdateInterval to work on iOS #800

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
435669a
Extract method to add observer for progress update
danhodos Sep 29, 2017
10cba5a
Reset progress observer on update interval changes
danhodos Sep 29, 2017
fd8ebbd
Merge branch 'master' into allow-progress-update-interval-to-work-on-ios
cobarx May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ios/RCTVideo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,16 @@ - (CMTimeRange)playerItemSeekableTimeRange
return (kCMTimeRangeZero);
}

- (void)addPlayerTimeObserver
-(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]; }
];
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. */
Expand Down Expand Up @@ -738,6 +739,11 @@ - (void)setControls:(BOOL)controls
- (void)setProgressUpdateInterval:(float)progressUpdateInterval
{
_progressUpdateInterval = progressUpdateInterval;

if (_timeObserver) {
[self removePlayerTimeObserver];
[self addPlayerTimeObserver];
}
}

- (void)removePlayerLayer
Expand Down