From 435669a944430fa51b8bbd640c6bf66c7756a1ce Mon Sep 17 00:00:00 2001
From: Dan Hodos <danhodos@gmail.com>
Date: Thu, 28 Sep 2017 21:37:26 -0400
Subject: [PATCH 1/2] Extract method to add observer for progress update

---
 ios/RCTVideo.m | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ios/RCTVideo.m b/ios/RCTVideo.m
index 9962c2bb14..88f3a640b1 100644
--- a/ios/RCTVideo.m
+++ b/ios/RCTVideo.m
@@ -124,6 +124,16 @@ - (CMTimeRange)playerItemSeekableTimeRange
     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 @@ - (void)setSrc:(NSDictionary *)source
   [_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

From 10cba5ad5c545a1ea6a6e7d53020f834466aa72e Mon Sep 17 00:00:00 2001
From: Dan Hodos <danhodos@gmail.com>
Date: Thu, 28 Sep 2017 21:37:52 -0400
Subject: [PATCH 2/2] Reset progress observer on update interval changes

---
 ios/RCTVideo.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ios/RCTVideo.m b/ios/RCTVideo.m
index 88f3a640b1..68e52e3103 100644
--- a/ios/RCTVideo.m
+++ b/ios/RCTVideo.m
@@ -725,6 +725,11 @@ - (void)setControls:(BOOL)controls
 - (void)setProgressUpdateInterval:(float)progressUpdateInterval
 {
   _progressUpdateInterval = progressUpdateInterval;
+
+  if (_timeObserver) {
+    [self removePlayerTimeObserver];
+    [self addPlayerTimeObserver];
+  }
 }
 
 - (void)removePlayerLayer