From 91fc16959cb468ca5f38015282b871d29d85d4fb Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Wed, 10 Jul 2019 15:41:25 +0530
Subject: [PATCH 01/41] added trackId to exoplayer onLoad callback

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java    | 3 ++-
 .../java/com/brentvatne/exoplayer/VideoEventEmitter.java     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 655e4e286e..1826421374 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -549,8 +549,9 @@ private void videoLoaded() {
             Format videoFormat = player.getVideoFormat();
             int width = videoFormat != null ? videoFormat.width : 0;
             int height = videoFormat != null ? videoFormat.height : 0;
+            int trackId = videoFormat != null ? videoFormat.id : -1;
             eventEmitter.load(player.getDuration(), player.getCurrentPosition(), width, height,
-                    getAudioTrackInfo(), getTextTrackInfo(), getVideoTrackInfo());
+                    getAudioTrackInfo(), getTextTrackInfo(), getVideoTrackInfo(), trackId);
         }
     }
 
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 00f51c94cd..72381266bc 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -109,6 +109,7 @@ class VideoEventEmitter {
     private static final String EVENT_PROP_CURRENT_TIME = "currentTime";
     private static final String EVENT_PROP_SEEK_TIME = "seekTime";
     private static final String EVENT_PROP_NATURAL_SIZE = "naturalSize";
+    private static final String EVENT_PROP_TRACK_ID = "trackId";
     private static final String EVENT_PROP_WIDTH = "width";
     private static final String EVENT_PROP_HEIGHT = "height";
     private static final String EVENT_PROP_ORIENTATION = "orientation";
@@ -137,7 +138,7 @@ void loadStart() {
     }
 
     void load(double duration, double currentPosition, int videoWidth, int videoHeight,
-              WritableArray audioTracks, WritableArray textTracks, WritableArray videoTracks) {
+              WritableArray audioTracks, WritableArray textTracks, WritableArray videoTracks, int trackId) {
         WritableMap event = Arguments.createMap();
         event.putDouble(EVENT_PROP_DURATION, duration / 1000D);
         event.putDouble(EVENT_PROP_CURRENT_TIME, currentPosition / 1000D);
@@ -151,7 +152,7 @@ void load(double duration, double currentPosition, int videoWidth, int videoHeig
             naturalSize.putString(EVENT_PROP_ORIENTATION, "portrait");
         }
         event.putMap(EVENT_PROP_NATURAL_SIZE, naturalSize);
-
+        event.putInt(EVENT_PROP_TRACK_ID, trackId);
         event.putArray(EVENT_PROP_VIDEO_TRACKS, videoTracks);
         event.putArray(EVENT_PROP_AUDIO_TRACKS, audioTracks);
         event.putArray(EVENT_PROP_TEXT_TRACKS, textTracks);

From e14221f05580e8ae0b629ee27b9d4a860b0c45ad Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Wed, 10 Jul 2019 17:14:52 +0530
Subject: [PATCH 02/41] added trackInfo to bandwidth callback

---
 .../com/brentvatne/exoplayer/ReactExoplayerView.java | 12 ++++++++++--
 .../com/brentvatne/exoplayer/VideoEventEmitter.java  |  9 ++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 1826421374..3a33c46e52 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -253,7 +253,15 @@ public void cleanUpResources() {
     @Override
     public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) {
         if (mReportBandwidth) {
-            eventEmitter.bandwidthReport(bitrate);
+            if (player === null) {
+                eventEmitter.bandwidthReport(bitrate, 0, 0, -1);
+            } else {
+                Format videoFormat = player.getVideoFormat();
+                int width = videoFormat != null ? videoFormat.width : 0;
+                int height = videoFormat != null ? videoFormat.height : 0;
+                String trackId = videoFormat != null ? videoFormat.id : "-1";
+                eventEmitter.bandwidthReport(bitrate, height, width, trackId);
+            }
         }
     }
 
@@ -549,7 +557,7 @@ private void videoLoaded() {
             Format videoFormat = player.getVideoFormat();
             int width = videoFormat != null ? videoFormat.width : 0;
             int height = videoFormat != null ? videoFormat.height : 0;
-            int trackId = videoFormat != null ? videoFormat.id : -1;
+            String trackId = videoFormat != null ? videoFormat.id : "-1";
             eventEmitter.load(player.getDuration(), player.getCurrentPosition(), width, height,
                     getAudioTrackInfo(), getTextTrackInfo(), getVideoTrackInfo(), trackId);
         }
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 72381266bc..533fdfd464 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -138,7 +138,7 @@ void loadStart() {
     }
 
     void load(double duration, double currentPosition, int videoWidth, int videoHeight,
-              WritableArray audioTracks, WritableArray textTracks, WritableArray videoTracks, int trackId) {
+              WritableArray audioTracks, WritableArray textTracks, WritableArray videoTracks, String trackId) {
         WritableMap event = Arguments.createMap();
         event.putDouble(EVENT_PROP_DURATION, duration / 1000D);
         event.putDouble(EVENT_PROP_CURRENT_TIME, currentPosition / 1000D);
@@ -152,7 +152,7 @@ void load(double duration, double currentPosition, int videoWidth, int videoHeig
             naturalSize.putString(EVENT_PROP_ORIENTATION, "portrait");
         }
         event.putMap(EVENT_PROP_NATURAL_SIZE, naturalSize);
-        event.putInt(EVENT_PROP_TRACK_ID, trackId);
+        event.putString(EVENT_PROP_TRACK_ID, trackId);
         event.putArray(EVENT_PROP_VIDEO_TRACKS, videoTracks);
         event.putArray(EVENT_PROP_AUDIO_TRACKS, audioTracks);
         event.putArray(EVENT_PROP_TEXT_TRACKS, textTracks);
@@ -177,9 +177,12 @@ void progressChanged(double currentPosition, double bufferedDuration, double see
         receiveEvent(EVENT_PROGRESS, event);
     }
 
-    void bandwidthReport(double bitRateEstimate) {
+    void bandwidthReport(double bitRateEstimate, int height, int width, String id) {
         WritableMap event = Arguments.createMap();
         event.putDouble(EVENT_PROP_BITRATE, bitRateEstimate);
+        event.putInt(EVENT_PROP_WIDTH, width);
+        event.putInt(EVENT_PROP_HEIGHT, height);
+        event.putString(EVENT_PROP_TRACK_ID, id);
         receiveEvent(EVENT_BANDWIDTH, event);
     }    
 

From a102ce788b2f521f3c6facd1eb3749a0f7d2df74 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Wed, 10 Jul 2019 17:21:30 +0530
Subject: [PATCH 03/41] syntax fix

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 3a33c46e52..d52e625ac7 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -253,7 +253,7 @@ public void cleanUpResources() {
     @Override
     public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) {
         if (mReportBandwidth) {
-            if (player === null) {
+            if (player == null) {
                 eventEmitter.bandwidthReport(bitrate, 0, 0, -1);
             } else {
                 Format videoFormat = player.getVideoFormat();

From eb14d95e7c27a210e55c0364a19efdef6f9250de Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Wed, 10 Jul 2019 17:27:59 +0530
Subject: [PATCH 04/41] syntax fix

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index d52e625ac7..e22581abd1 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -254,7 +254,7 @@ public void cleanUpResources() {
     public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) {
         if (mReportBandwidth) {
             if (player == null) {
-                eventEmitter.bandwidthReport(bitrate, 0, 0, -1);
+                eventEmitter.bandwidthReport(bitrate, 0, 0, "-1");
             } else {
                 Format videoFormat = player.getVideoFormat();
                 int width = videoFormat != null ? videoFormat.width : 0;

From 2ce2e34b4aeec89cab04045704351102f04132d5 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Tue, 3 Sep 2019 12:55:24 +0530
Subject: [PATCH 05/41] version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8e5e3ddc06..2617e38d83 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "4.3.1",
+    "version": "4.3.2",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 461165470bc51780b2befa27cf7cdc3baaafcddd Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Mon, 30 Sep 2019 17:26:51 +0530
Subject: [PATCH 06/41] sending complete logcat for media playback exception
 ExoPlaybackException

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 7 ++-----
 .../java/com/brentvatne/exoplayer/VideoEventEmitter.java   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index e22581abd1..d866609156 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -698,7 +698,7 @@ public void onPlaybackParametersChanged(PlaybackParameters params) {
 
     @Override
     public void onPlayerError(ExoPlaybackException e) {
-        String errorString = null;
+        String errorString = "ExoPlaybackException type : " + e.type;
         Exception ex = e;
         if (e.type == ExoPlaybackException.TYPE_RENDERER) {
             Exception cause = e.getRendererException();
@@ -723,12 +723,9 @@ public void onPlayerError(ExoPlaybackException e) {
             }
         }
         else if (e.type == ExoPlaybackException.TYPE_SOURCE) {
-            ex = e.getSourceException();
             errorString = getResources().getString(R.string.unrecognized_media_format);
         }
-        if (errorString != null) {
-            eventEmitter.error(errorString, ex);
-        }
+        eventEmitter.error(errorString, ex);
         playerNeedsSource = true;
         if (isBehindLiveWindow(e)) {
             clearResumePosition();
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 533fdfd464..7941e59b98 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -230,7 +230,7 @@ void fullscreenDidDismiss() {
     void error(String errorString, Exception exception) {
         WritableMap error = Arguments.createMap();
         error.putString(EVENT_PROP_ERROR_STRING, errorString);
-        error.putString(EVENT_PROP_ERROR_EXCEPTION, exception.getMessage());
+        error.putString(EVENT_PROP_ERROR_EXCEPTION, exception.toString());
         WritableMap event = Arguments.createMap();
         event.putMap(EVENT_PROP_ERROR, error);
         receiveEvent(EVENT_ERROR, event);

From 6a3659724ee04fdb4ea4dda4244b8e51790aa12c Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Tue, 12 Nov 2019 15:26:10 +0530
Subject: [PATCH 07/41] version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2617e38d83..bdcb70ea08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "4.3.2",
+    "version": "4.3.3",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 7462dd8e9bbcb2d60f68b03e4e5179e9b0a34bbd Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Fri, 15 Nov 2019 11:58:21 +0530
Subject: [PATCH 08/41] package publish changes

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index bdcb70ea08..232944c64e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "react-native-video",
-    "version": "4.3.3",
+    "name": "@curefit/react-native-video",
+    "version": "4.3.4",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",
@@ -25,7 +25,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git@github.com:react-native-community/react-native-video.git"
+        "url": "git+https://github.com/curefit/react-native-video.git"
     },
     "devDependencies": {
         "babel-eslint": "5.0.0-beta8",

From e45cb13952714ad01e52fa62a6f8ba1927324cf7 Mon Sep 17 00:00:00 2001
From: parikshit <parikshit@curefit.com>
Date: Mon, 18 Nov 2019 00:33:56 +0530
Subject: [PATCH 09/41] Live playback fix

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index d866609156..7bf91eecf4 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -736,12 +736,14 @@ else if (e.type == ExoPlaybackException.TYPE_SOURCE) {
     }
 
     private static boolean isBehindLiveWindow(ExoPlaybackException e) {
+        com.google.android.exoplayer2.util.Log.e("ExoPlayer Exception", e.toString());
         if (e.type != ExoPlaybackException.TYPE_SOURCE) {
             return false;
         }
         Throwable cause = e.getSourceException();
         while (cause != null) {
-            if (cause instanceof BehindLiveWindowException) {
+            if (cause instanceof BehindLiveWindowException ||
+                    cause instanceof HttpDataSource.HttpDataSourceException) {
                 return true;
             }
             cause = cause.getCause();

From b9b8f8982daf5770297ef1956de38510096f81e3 Mon Sep 17 00:00:00 2001
From: parikshit <parikshit@curefit.com>
Date: Mon, 18 Nov 2019 13:39:59 +0530
Subject: [PATCH 10/41] Version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 232944c64e..1a6f904cda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.4",
+    "version": "4.3.5",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 1a128400667b69320a64d2efa62b312f1999d874 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Mon, 18 Nov 2019 14:45:41 +0530
Subject: [PATCH 11/41] import fix

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 7bf91eecf4..30e5e3dfac 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -62,6 +62,7 @@
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 

From 9f53c62e00ce098c703d3fc7d52d53376716aef9 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Mon, 18 Nov 2019 14:46:36 +0530
Subject: [PATCH 12/41] version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1a6f904cda..7e937d152b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.5",
+    "version": "4.3.6",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 2039e958a09960df976cfb8917854f2263f9d6fd Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Fri, 13 Dec 2019 14:42:05 +0530
Subject: [PATCH 13/41] configurable preferredForwardBufferDuration

---
 Video.js                    | 1 +
 ios/Video/RCTVideo.m        | 9 +++++++++
 ios/Video/RCTVideoManager.m | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Video.js b/Video.js
index e5d56729e9..e42c56bcd5 100644
--- a/Video.js
+++ b/Video.js
@@ -430,6 +430,7 @@ Video.propTypes = {
   rate: PropTypes.number,
   pictureInPicture: PropTypes.bool,
   playInBackground: PropTypes.bool,
+  preferredForwardBufferDuration: PropTypes.number,
   playWhenInactive: PropTypes.bool,
   ignoreSilentSwitch: PropTypes.oneOf(['ignore', 'obey']),
   reportBandwidth: PropTypes.bool,
diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index 3e666e60cd..3216880c5c 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -64,6 +64,7 @@ @implementation RCTVideo
   NSDictionary * _selectedAudioTrack;
   BOOL _playbackStalled;
   BOOL _playInBackground;
+  float _preferredForwardBufferDuration;
   BOOL _playWhenInactive;
   BOOL _pictureInPicture;
   NSString * _ignoreSilentSwitch;
@@ -104,6 +105,7 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
     _controls = NO;
     _playerBufferEmpty = YES;
     _playInBackground = false;
+    _preferredForwardBufferDuration = 0.0f;
     _allowsExternalPlayback = YES;
     _playWhenInactive = false;
     _pictureInPicture = false;
@@ -352,6 +354,7 @@ - (void)setSrc:(NSDictionary *)source
     // perform on next run loop, otherwise other passed react-props may not be set
     [self playerItemForSource:source withCallback:^(AVPlayerItem * playerItem) {
       _playerItem = playerItem;
+      [self setPreferredForwardBufferDuration:_preferredForwardBufferDuration];
       [self addPlayerItemObservers];
       [self setFilter:_filterName];
       [self setMaxBitRate:_maxBitRate];
@@ -961,6 +964,12 @@ - (void)setMaxBitRate:(float) maxBitRate {
   _playerItem.preferredPeakBitRate = maxBitRate;
 }
 
+- (void)setPreferredForwardBufferDuration:(float) preferredForwardBufferDuration
+{
+  _preferredForwardBufferDuration = preferredForwardBufferDuration;
+  _playerItem.preferredForwardBufferDuration = preferredForwardBufferDuration;
+}
+
 - (void)setAutomaticallyWaitsToMinimizeStalling:(BOOL)waits
 {
 	_automaticallyWaitsToMinimizeStalling = waits;
diff --git a/ios/Video/RCTVideoManager.m b/ios/Video/RCTVideoManager.m
index 7233646f37..05f0c75620 100644
--- a/ios/Video/RCTVideoManager.m
+++ b/ios/Video/RCTVideoManager.m
@@ -32,6 +32,7 @@ - (dispatch_queue_t)methodQueue
 RCT_EXPORT_VIEW_PROPERTY(controls, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(volume, float);
 RCT_EXPORT_VIEW_PROPERTY(playInBackground, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(preferredForwardBufferDuration, float);
 RCT_EXPORT_VIEW_PROPERTY(playWhenInactive, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(pictureInPicture, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(ignoreSilentSwitch, NSString);

From 33036748a2ad325e44c5b54bab6b42ba8ee06d87 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Fri, 13 Dec 2019 14:42:05 +0530
Subject: [PATCH 14/41] configurable preferredForwardBufferDuration

---
 Video.js                    | 1 +
 ios/Video/RCTVideo.m        | 8 ++++++++
 ios/Video/RCTVideoManager.m | 1 +
 3 files changed, 10 insertions(+)

diff --git a/Video.js b/Video.js
index 703aef5e00..3875674bab 100644
--- a/Video.js
+++ b/Video.js
@@ -391,6 +391,7 @@ Video.propTypes = {
   stereoPan: PropTypes.number,
   rate: PropTypes.number,
   playInBackground: PropTypes.bool,
+  preferredForwardBufferDuration: PropTypes.number,
   playWhenInactive: PropTypes.bool,
   ignoreSilentSwitch: PropTypes.oneOf(['ignore', 'obey']),
   reportBandwidth: PropTypes.bool,
diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index 52b0342a6b..cc9a9bc64c 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -63,6 +63,7 @@ @implementation RCTVideo
   NSDictionary * _selectedAudioTrack;
   BOOL _playbackStalled;
   BOOL _playInBackground;
+  float _preferredForwardBufferDuration;
   BOOL _playWhenInactive;
   NSString * _ignoreSilentSwitch;
   NSString * _resizeMode;
@@ -98,6 +99,7 @@ - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
     _controls = NO;
     _playerBufferEmpty = YES;
     _playInBackground = false;
+    _preferredForwardBufferDuration = 0.0f;
     _allowsExternalPlayback = YES;
     _playWhenInactive = false;
     _ignoreSilentSwitch = @"inherit"; // inherit, ignore, obey
@@ -340,6 +342,7 @@ - (void)setSrc:(NSDictionary *)source
     // perform on next run loop, otherwise other passed react-props may not be set
     [self playerItemForSource:source withCallback:^(AVPlayerItem * playerItem) {
       _playerItem = playerItem;
+      [self setPreferredForwardBufferDuration:_preferredForwardBufferDuration];
       [self addPlayerItemObservers];
       [self setFilter:_filterName];
       [self setMaxBitRate:_maxBitRate];
@@ -884,6 +887,11 @@ - (void)setMaxBitRate:(float) maxBitRate {
   _playerItem.preferredPeakBitRate = maxBitRate;
 }
 
+- (void)setPreferredForwardBufferDuration:(float) preferredForwardBufferDuration
+{
+  _preferredForwardBufferDuration = preferredForwardBufferDuration;
+  _playerItem.preferredForwardBufferDuration = preferredForwardBufferDuration;
+}
 
 - (void)applyModifiers
 {
diff --git a/ios/Video/RCTVideoManager.m b/ios/Video/RCTVideoManager.m
index 1ca1b5b402..bc71a06779 100644
--- a/ios/Video/RCTVideoManager.m
+++ b/ios/Video/RCTVideoManager.m
@@ -31,6 +31,7 @@ - (dispatch_queue_t)methodQueue
 RCT_EXPORT_VIEW_PROPERTY(controls, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(volume, float);
 RCT_EXPORT_VIEW_PROPERTY(playInBackground, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(preferredForwardBufferDuration, float);
 RCT_EXPORT_VIEW_PROPERTY(playWhenInactive, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(ignoreSilentSwitch, NSString);
 RCT_EXPORT_VIEW_PROPERTY(rate, float);

From 1acc1e2bd0865ea67fc501584b4ee0ad0f36bf75 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Fri, 13 Dec 2019 16:09:30 +0530
Subject: [PATCH 15/41] version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e937d152b..17bd1f33c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.6",
+    "version": "4.3.7",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 55261366ad82f65406788420b04cc5cd5f4f83fe Mon Sep 17 00:00:00 2001
From: parikshit <parikshit@curefit.com>
Date: Mon, 9 Dec 2019 16:43:31 +0530
Subject: [PATCH 16/41] Exposing time

---
 android/src/main/java/com/brentvatne/react/ReactVideoView.java | 1 +
 ios/Video/RCTVideo.m                                           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
index 89b4b89cdf..e857ea3f5b 100644
--- a/android/src/main/java/com/brentvatne/react/ReactVideoView.java
+++ b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -162,6 +162,7 @@ public void run() {
                     event.putDouble(EVENT_PROP_CURRENT_TIME, mMediaPlayer.getCurrentPosition() / 1000.0);
                     event.putDouble(EVENT_PROP_PLAYABLE_DURATION, mVideoBufferedDuration / 1000.0); //TODO:mBufferUpdateRunnable
                     event.putDouble(EVENT_PROP_SEEKABLE_DURATION, mVideoDuration / 1000.0);
+                    event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs())
                     mEventEmitter.receiveEvent(getId(), Events.EVENT_PROGRESS.toString(), event);
 
                     // Check for update after an interval
diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index cc9a9bc64c..187476003f 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -253,6 +253,7 @@ - (void)sendProgressUpdate
   }
   
   CMTime currentTime = _player.currentTime;
+  CMTime currentTime2 = _player.currentDate;
   const Float64 duration = CMTimeGetSeconds(playerDuration);
   const Float64 currentTimeSecs = CMTimeGetSeconds(currentTime);
   
@@ -264,6 +265,7 @@ - (void)sendProgressUpdate
                            @"playableDuration": [self calculatePlayableDuration],
                            @"atValue": [NSNumber numberWithLongLong:currentTime.value],
                            @"atTimescale": [NSNumber numberWithInt:currentTime.timescale],
+                           @"currentTime2": [NSNumber numberWithDouble:currentTime2.timeIntervalBetween1970AndReferenceDate()],
                            @"target": self.reactTag,
                            @"seekableDuration": [self calculateSeekableDuration],
                            });

From b25e22ae338941fb6c2b25402b04752273dee577 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Tue, 17 Dec 2019 14:26:36 +0530
Subject: [PATCH 17/41] exo player window current tsp

---
 .../com/brentvatne/exoplayer/ReactExoplayerView.java   | 10 +++++++++-
 .../com/brentvatne/exoplayer/VideoEventEmitter.java    |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 30e5e3dfac..1cbede99ad 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -159,7 +159,7 @@ public void handleMessage(Message msg) {
                             ) {
                         long pos = player.getCurrentPosition();
                         long bufferedDuration = player.getBufferedPercentage() * player.getDuration() / 100;
-                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration());
+                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration(), getPositionInFirstPeriodMsForCurrentWindow());
                         msg = obtainMessage(SHOW_PROGRESS);
                         sendMessageDelayed(msg, Math.round(mProgressUpdateInterval));
                     }
@@ -168,6 +168,14 @@ public void handleMessage(Message msg) {
         }
     };
 
+    public getPositionInFirstPeriodMsForCurrentWindow() {
+        Timeline.Window window = new Timeline.Window();
+        if(!Timeline.isEmpty) {    
+            player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
+        }
+        return window.windowStartTimeMs
+    }
+
     public ReactExoplayerView(ThemedReactContext context) {
         super(context);
         this.themedReactContext = context;
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 7941e59b98..3a9256e321 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -169,11 +169,12 @@ void load(double duration, double currentPosition, int videoWidth, int videoHeig
         receiveEvent(EVENT_LOAD, event);
     }
 
-    void progressChanged(double currentPosition, double bufferedDuration, double seekableDuration) {
+    void progressChanged(double currentPosition, double bufferedDuration, double seekableDuration, double currentPosition2) {
         WritableMap event = Arguments.createMap();
         event.putDouble(EVENT_PROP_CURRENT_TIME, currentPosition / 1000D);
         event.putDouble(EVENT_PROP_PLAYABLE_DURATION, bufferedDuration / 1000D);
         event.putDouble(EVENT_PROP_SEEKABLE_DURATION, seekableDuration / 1000D);
+        event.putDouble(EVENT_PROP_CURRENT_TIME+"2", currentPosition2 / 1000D);
         receiveEvent(EVENT_PROGRESS, event);
     }
 

From 86f65352d079885d724865bc2950ba1475d5ff25 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Tue, 17 Dec 2019 14:33:03 +0530
Subject: [PATCH 18/41] return type

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 1cbede99ad..eac57b1a97 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -168,7 +168,7 @@ public void handleMessage(Message msg) {
         }
     };
 
-    public getPositionInFirstPeriodMsForCurrentWindow() {
+    public double getPositionInFirstPeriodMsForCurrentWindow() {
         Timeline.Window window = new Timeline.Window();
         if(!Timeline.isEmpty) {    
             player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);

From 981368d64bba068b325fa4eccbbb49dafbf740c6 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Tue, 17 Dec 2019 15:27:37 +0530
Subject: [PATCH 19/41] Current window timestamp in epoch

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java   | 6 +++---
 .../java/com/brentvatne/exoplayer/VideoEventEmitter.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index eac57b1a97..7343450f96 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -167,13 +167,13 @@ public void handleMessage(Message msg) {
             }
         }
     };
-
+    
     public double getPositionInFirstPeriodMsForCurrentWindow() {
         Timeline.Window window = new Timeline.Window();
-        if(!Timeline.isEmpty) {    
+        if(!player.getCurrentTimeline().isEmpty()) {    
             player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
         }
-        return window.windowStartTimeMs
+        return window.windowStartTimeMs + window.getPositionInFirstPeriodMs();
     }
 
     public ReactExoplayerView(ThemedReactContext context) {
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 3a9256e321..9a848de93b 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -174,7 +174,7 @@ void progressChanged(double currentPosition, double bufferedDuration, double see
         event.putDouble(EVENT_PROP_CURRENT_TIME, currentPosition / 1000D);
         event.putDouble(EVENT_PROP_PLAYABLE_DURATION, bufferedDuration / 1000D);
         event.putDouble(EVENT_PROP_SEEKABLE_DURATION, seekableDuration / 1000D);
-        event.putDouble(EVENT_PROP_CURRENT_TIME+"2", currentPosition2 / 1000D);
+        event.putDouble(EVENT_PROP_CURRENT_TIME+"2", currentPosition2);
         receiveEvent(EVENT_PROGRESS, event);
     }
 

From 389511ffece4a40e58147c5aa159c6381bc7d441 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Wed, 18 Dec 2019 14:31:36 +0530
Subject: [PATCH 20/41] iOS changes

---
 ios/Video/RCTVideo.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index 187476003f..907517bc71 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -253,7 +253,7 @@ - (void)sendProgressUpdate
   }
   
   CMTime currentTime = _player.currentTime;
-  CMTime currentTime2 = _player.currentDate;
+  NSDate *currentTime2 = _player.currentItem.currentDate;
   const Float64 duration = CMTimeGetSeconds(playerDuration);
   const Float64 currentTimeSecs = CMTimeGetSeconds(currentTime);
   
@@ -265,7 +265,7 @@ - (void)sendProgressUpdate
                            @"playableDuration": [self calculatePlayableDuration],
                            @"atValue": [NSNumber numberWithLongLong:currentTime.value],
                            @"atTimescale": [NSNumber numberWithInt:currentTime.timescale],
-                           @"currentTime2": [NSNumber numberWithDouble:currentTime2.timeIntervalBetween1970AndReferenceDate()],
+                           @"currentTime2": [NSNumber numberWithLongLong:[@(floor([currentTime2 timeIntervalSince1970] * 1000)) longLongValue]],
                            @"target": self.reactTag,
                            @"seekableDuration": [self calculateSeekableDuration],
                            });

From 2fc7f7b48e8cdba6c17963f8d2b9d2f0997ecf3d Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Tue, 14 Jan 2020 13:26:15 +0530
Subject: [PATCH 21/41] version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4463d459ba..00cd8c1bb6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "5.1.0",
+    "version": "5.1.1",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 691a6bf32041e03184cd96deb05476a2cc7d73b0 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 20 Jan 2020 10:05:18 +0530
Subject: [PATCH 22/41] Updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 17bd1f33c5..d4c89b3d11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.7",
+    "version": "4.3.8",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From d1539ce5d3aca1188a7f024727288eb9cb82d789 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 20 Jan 2020 10:15:09 +0530
Subject: [PATCH 23/41] updated version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d4c89b3d11..266a1b5dbf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.8",
+    "version": "4.3.9",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 83afd5ffbac75b34e633dd7a88bdf066e44c4091 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Tue, 21 Jan 2020 18:08:23 +0530
Subject: [PATCH 24/41] CurrentTime bug fix

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 7343450f96..093d3937f7 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -173,7 +173,7 @@ public double getPositionInFirstPeriodMsForCurrentWindow() {
         if(!player.getCurrentTimeline().isEmpty()) {    
             player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
         }
-        return window.windowStartTimeMs + window.getPositionInFirstPeriodMs();
+        return window.windowStartTimeMs;
     }
 
     public ReactExoplayerView(ThemedReactContext context) {

From 6a96902cd3dabee66f6fd691ebeaf0830177625e Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Tue, 21 Jan 2020 18:08:45 +0530
Subject: [PATCH 25/41] Updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 266a1b5dbf..f1f93c9a86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.9",
+    "version": "4.3.10",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 5d4e91d1b31090484ae1a24cdd492663eb4679e9 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Wed, 22 Jan 2020 17:14:31 +0530
Subject: [PATCH 26/41] Updated currentPlaybackTime

---
 .../java/com/brentvatne/exoplayer/VideoEventEmitter.java     | 5 +++--
 ios/Video/RCTVideo.m                                         | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
index 9a848de93b..a75516e068 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java
@@ -107,6 +107,7 @@ class VideoEventEmitter {
     private static final String EVENT_PROP_PLAYABLE_DURATION = "playableDuration";
     private static final String EVENT_PROP_SEEKABLE_DURATION = "seekableDuration";
     private static final String EVENT_PROP_CURRENT_TIME = "currentTime";
+    private static final String EVENT_PROP_CURRENT_PLAYBACK_TIME = "currentPlaybackTime";
     private static final String EVENT_PROP_SEEK_TIME = "seekTime";
     private static final String EVENT_PROP_NATURAL_SIZE = "naturalSize";
     private static final String EVENT_PROP_TRACK_ID = "trackId";
@@ -169,12 +170,12 @@ void load(double duration, double currentPosition, int videoWidth, int videoHeig
         receiveEvent(EVENT_LOAD, event);
     }
 
-    void progressChanged(double currentPosition, double bufferedDuration, double seekableDuration, double currentPosition2) {
+    void progressChanged(double currentPosition, double bufferedDuration, double seekableDuration, double currentPlaybackTime) {
         WritableMap event = Arguments.createMap();
         event.putDouble(EVENT_PROP_CURRENT_TIME, currentPosition / 1000D);
         event.putDouble(EVENT_PROP_PLAYABLE_DURATION, bufferedDuration / 1000D);
         event.putDouble(EVENT_PROP_SEEKABLE_DURATION, seekableDuration / 1000D);
-        event.putDouble(EVENT_PROP_CURRENT_TIME+"2", currentPosition2);
+        event.putDouble(EVENT_PROP_CURRENT_PLAYBACK_TIME, currentPlaybackTime);
         receiveEvent(EVENT_PROGRESS, event);
     }
 
diff --git a/ios/Video/RCTVideo.m b/ios/Video/RCTVideo.m
index 907517bc71..2b39bd8391 100644
--- a/ios/Video/RCTVideo.m
+++ b/ios/Video/RCTVideo.m
@@ -253,7 +253,7 @@ - (void)sendProgressUpdate
   }
   
   CMTime currentTime = _player.currentTime;
-  NSDate *currentTime2 = _player.currentItem.currentDate;
+  NSDate *currentPlaybackTime = _player.currentItem.currentDate;
   const Float64 duration = CMTimeGetSeconds(playerDuration);
   const Float64 currentTimeSecs = CMTimeGetSeconds(currentTime);
   
@@ -265,7 +265,7 @@ - (void)sendProgressUpdate
                            @"playableDuration": [self calculatePlayableDuration],
                            @"atValue": [NSNumber numberWithLongLong:currentTime.value],
                            @"atTimescale": [NSNumber numberWithInt:currentTime.timescale],
-                           @"currentTime2": [NSNumber numberWithLongLong:[@(floor([currentTime2 timeIntervalSince1970] * 1000)) longLongValue]],
+                           @"currentPlaybackTime": [NSNumber numberWithLongLong:[@(floor([currentPlaybackTime timeIntervalSince1970] * 1000)) longLongValue]],
                            @"target": self.reactTag,
                            @"seekableDuration": [self calculateSeekableDuration],
                            });

From 802abfc2b193ecafb49ef141f938754a09f51cb0 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Wed, 22 Jan 2020 17:18:01 +0530
Subject: [PATCH 27/41] Updated currentPlayback logic

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 093d3937f7..44cb971ffa 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -159,7 +159,7 @@ public void handleMessage(Message msg) {
                             ) {
                         long pos = player.getCurrentPosition();
                         long bufferedDuration = player.getBufferedPercentage() * player.getDuration() / 100;
-                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration(), getPositionInFirstPeriodMsForCurrentWindow());
+                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration(), getPositionInFirstPeriodMsForCurrentWindow(currentPosition));
                         msg = obtainMessage(SHOW_PROGRESS);
                         sendMessageDelayed(msg, Math.round(mProgressUpdateInterval));
                     }
@@ -168,12 +168,12 @@ public void handleMessage(Message msg) {
         }
     };
     
-    public double getPositionInFirstPeriodMsForCurrentWindow() {
+    public double getPositionInFirstPeriodMsForCurrentWindow(currentPosition) {
         Timeline.Window window = new Timeline.Window();
         if(!player.getCurrentTimeline().isEmpty()) {    
             player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
         }
-        return window.windowStartTimeMs;
+        return window.windowStartTimeMs + currentPosition;
     }
 
     public ReactExoplayerView(ThemedReactContext context) {

From 585832b0f14242d44e315b8428d05c4a1332b4d8 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Wed, 22 Jan 2020 17:18:33 +0530
Subject: [PATCH 28/41] Updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f1f93c9a86..a2be8c580d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.10",
+    "version": "4.3.11",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From f9dfbdbdba5b7c186f8bed5758086139e75af785 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Wed, 22 Jan 2020 17:53:13 +0530
Subject: [PATCH 29/41] Bug fix

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java     | 4 ++--
 package.json                                                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 44cb971ffa..fbf8573ba3 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -159,7 +159,7 @@ public void handleMessage(Message msg) {
                             ) {
                         long pos = player.getCurrentPosition();
                         long bufferedDuration = player.getBufferedPercentage() * player.getDuration() / 100;
-                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration(), getPositionInFirstPeriodMsForCurrentWindow(currentPosition));
+                        eventEmitter.progressChanged(pos, bufferedDuration, player.getDuration(), getPositionInFirstPeriodMsForCurrentWindow(pos));
                         msg = obtainMessage(SHOW_PROGRESS);
                         sendMessageDelayed(msg, Math.round(mProgressUpdateInterval));
                     }
@@ -168,7 +168,7 @@ public void handleMessage(Message msg) {
         }
     };
     
-    public double getPositionInFirstPeriodMsForCurrentWindow(currentPosition) {
+    public double getPositionInFirstPeriodMsForCurrentWindow(long currentPosition) {
         Timeline.Window window = new Timeline.Window();
         if(!player.getCurrentTimeline().isEmpty()) {    
             player.getCurrentTimeline().getWindow(player.getCurrentWindowIndex(), window);
diff --git a/package.json b/package.json
index a2be8c580d..1444f74e30 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "4.3.11",
+    "version": "4.3.12",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 4b31eb5ad5195b7fd303b66d7a166ed20afb1a46 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 3 Feb 2020 14:42:45 +0530
Subject: [PATCH 30/41] Added semicolon

---
 android/src/main/java/com/brentvatne/react/ReactVideoView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
index e857ea3f5b..b65112f524 100644
--- a/android/src/main/java/com/brentvatne/react/ReactVideoView.java
+++ b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -162,7 +162,7 @@ public void run() {
                     event.putDouble(EVENT_PROP_CURRENT_TIME, mMediaPlayer.getCurrentPosition() / 1000.0);
                     event.putDouble(EVENT_PROP_PLAYABLE_DURATION, mVideoBufferedDuration / 1000.0); //TODO:mBufferUpdateRunnable
                     event.putDouble(EVENT_PROP_SEEKABLE_DURATION, mVideoDuration / 1000.0);
-                    event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs())
+                    event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs());
                     mEventEmitter.receiveEvent(getId(), Events.EVENT_PROGRESS.toString(), event);
 
                     // Check for update after an interval

From f4d81679d88a1f36318ac25cc27ad97cee254c51 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 3 Feb 2020 14:47:32 +0530
Subject: [PATCH 31/41] updated package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e8b6fb37c7..dabce47406 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "5.1.2",
+    "version": "5.1.3",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From ef7df20c5b80e624dda4db2788a1705db4ab2039 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 3 Feb 2020 15:08:05 +0530
Subject: [PATCH 32/41] Updated ReactVideoView

---
 android/src/main/java/com/brentvatne/react/ReactVideoView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
index b65112f524..c1bc8872dd 100644
--- a/android/src/main/java/com/brentvatne/react/ReactVideoView.java
+++ b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -162,7 +162,7 @@ public void run() {
                     event.putDouble(EVENT_PROP_CURRENT_TIME, mMediaPlayer.getCurrentPosition() / 1000.0);
                     event.putDouble(EVENT_PROP_PLAYABLE_DURATION, mVideoBufferedDuration / 1000.0); //TODO:mBufferUpdateRunnable
                     event.putDouble(EVENT_PROP_SEEKABLE_DURATION, mVideoDuration / 1000.0);
-                    event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs());
+                    // event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs());
                     mEventEmitter.receiveEvent(getId(), Events.EVENT_PROGRESS.toString(), event);
 
                     // Check for update after an interval

From 877263e4263d3f4b20666e62055777c3f1465230 Mon Sep 17 00:00:00 2001
From: Rishu Agrawal <rishu.agrawal@v.curefit.com>
Date: Mon, 3 Feb 2020 15:29:58 +0530
Subject: [PATCH 33/41] updated verison

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dabce47406..2904c40840 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "5.1.3",
+    "version": "5.1.4",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From e7702c5f18b95305e8604293973873f75875081d Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Mon, 13 Jul 2020 19:03:10 +0530
Subject: [PATCH 34/41] added cookiePolicy prop for ExoPlayer

---
 README.md                                     |  9 +++++++++
 Video.js                                      |  1 +
 .../exoplayer/ReactExoplayerView.java         | 19 ++++++++++++++++++-
 .../exoplayer/ReactExoplayerViewManager.java  |  6 ++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 964aa9043f..8303fbb5fc 100644
--- a/README.md
+++ b/README.md
@@ -305,6 +305,7 @@ var styles = StyleSheet.create({
 * [hideShutterView](#hideshutterview)
 * [id](#id)
 * [ignoreSilentSwitch](#ignoresilentswitch)
+* [cookiePolicy](#cookiepolicy)
 * [maxBitRate](#maxbitrate)
 * [minLoadRetryCount](#minLoadRetryCount)
 * [muted](#muted)
@@ -521,6 +522,14 @@ Controls the iOS silent switch behavior
 
 Platforms: iOS
 
+#### cookiePolicy
+Changes the android cookie policy
+* **"original" (default)** - Sets the CookiePolicy as ACCEPT_ORIGINAL_SERVER
+* **"all"** - Sets the CookiePolicy as ACCEPT_ALL
+* **"none"** - Sets the CookiePolicy as ACCEPT_NONE
+
+Platforms: Android ExoPlayer
+
 #### maxBitRate
 Sets the desired limit, in bits per second, of network bandwidth consumption when multiple video streams are available for a playlist.
 
diff --git a/Video.js b/Video.js
index e42c56bcd5..da9bd1d6d5 100644
--- a/Video.js
+++ b/Video.js
@@ -433,6 +433,7 @@ Video.propTypes = {
   preferredForwardBufferDuration: PropTypes.number,
   playWhenInactive: PropTypes.bool,
   ignoreSilentSwitch: PropTypes.oneOf(['ignore', 'obey']),
+  cookiePolicy: PropTypes.oneOf(['original', 'all', 'none']),
   reportBandwidth: PropTypes.bool,
   disableFocus: PropTypes.bool,
   controls: PropTypes.bool,
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index b871b960dd..de3f13b422 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -87,7 +87,6 @@ class ReactExoplayerView extends FrameLayout implements
 
     static {
         DEFAULT_COOKIE_MANAGER = new CookieManager();
-        DEFAULT_COOKIE_MANAGER.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
     }
 
     private final VideoEventEmitter eventEmitter;
@@ -139,6 +138,7 @@ class ReactExoplayerView extends FrameLayout implements
     private boolean playInBackground = false;
     private Map<String, String> requestHeaders;
     private boolean mReportBandwidth = false;
+    private String mCookiePolicy = "original";
     private boolean controls;
     // \ End props
 
@@ -202,6 +202,7 @@ private void createViews() {
         clearResumePosition();
         mediaDataSourceFactory = buildDataSourceFactory(true);
         if (CookieHandler.getDefault() != DEFAULT_COOKIE_MANAGER) {
+            DEFAULT_COOKIE_MANAGER.setCookiePolicy(this.getCookiePolicy());
             CookieHandler.setDefault(DEFAULT_COOKIE_MANAGER);
         }
 
@@ -419,6 +420,18 @@ public void run() {
         }, 1);
     }
 
+    private CookiePolicy getCookiePolicy() {
+        switch (mCookiePolicy) {
+            case "all":
+                return CookiePolicy.ACCEPT_ALL;
+            case "none":
+                return CookiePolicy.ACCEPT_NONE;
+            case "original":
+            default:
+                return CookiePolicy.ACCEPT_ORIGINAL_SERVER;
+        }
+    }
+
     private MediaSource buildMediaSource(Uri uri, String overrideExtension) {
         int type = Util.inferContentType(!TextUtils.isEmpty(overrideExtension) ? "." + overrideExtension
                 : uri.getLastPathSegment());
@@ -931,6 +944,10 @@ public void setReportBandwidth(boolean reportBandwidth) {
         mReportBandwidth = reportBandwidth;
     }
 
+    public void setCookiePolicy(String cookiePolicy) {
+        mCookiePolicy = cookiePolicy;
+    }
+
     public void setRawSrc(final Uri uri, final String extension) {
         if (uri != null) {
             boolean isOriginalSourceNull = srcUri == null;
diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
index c7c9634644..80f824972f 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
@@ -46,6 +46,7 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi
     private static final String PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS = "bufferForPlaybackAfterRebufferMs";
     private static final String PROP_PROGRESS_UPDATE_INTERVAL = "progressUpdateInterval";
     private static final String PROP_REPORT_BANDWIDTH = "reportBandwidth";
+    private static final String PROP_COOKIE_POLICY = "cookiePolicy";
     private static final String PROP_SEEK = "seek";
     private static final String PROP_RATE = "rate";
     private static final String PROP_MIN_LOAD_RETRY_COUNT = "minLoadRetryCount";
@@ -223,6 +224,11 @@ public void setReportBandwidth(final ReactExoplayerView videoView, final boolean
         videoView.setReportBandwidth(reportBandwidth);
     }
 
+    @ReactProp(name = PROP_COOKIE_POLICY)
+    public void setCookiePolicy(final ReactExoplayerView videoView, final String cookiePolicy) {
+        videoView.setCookiePolicy(cookiePolicy);
+    }
+
     @ReactProp(name = PROP_SEEK)
     public void setSeek(final ReactExoplayerView videoView, final float seek) {
         videoView.seekTo(Math.round(seek * 1000f));

From f1dff4d13710f5dd6feb5455029f8adb51428678 Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Tue, 14 Jul 2020 12:55:04 +0530
Subject: [PATCH 35/41] setting cookie policy from props

---
 .../java/com/brentvatne/exoplayer/ReactExoplayerView.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index de3f13b422..f9130e4a0e 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -138,7 +138,7 @@ class ReactExoplayerView extends FrameLayout implements
     private boolean playInBackground = false;
     private Map<String, String> requestHeaders;
     private boolean mReportBandwidth = false;
-    private String mCookiePolicy = "original";
+    private String mCookiePolicy = "all";
     private boolean controls;
     // \ End props
 
@@ -946,6 +946,8 @@ public void setReportBandwidth(boolean reportBandwidth) {
 
     public void setCookiePolicy(String cookiePolicy) {
         mCookiePolicy = cookiePolicy;
+        DEFAULT_COOKIE_MANAGER.setCookiePolicy(this.getCookiePolicy());
+        CookieHandler.setDefault(DEFAULT_COOKIE_MANAGER);
     }
 
     public void setRawSrc(final Uri uri, final String extension) {

From d6726ed3f3cc6c0ae9d078b41f17a99bfd7e560c Mon Sep 17 00:00:00 2001
From: anubansal <anu.bansal@curefit.com>
Date: Tue, 14 Jul 2020 12:57:36 +0530
Subject: [PATCH 36/41] version update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2904c40840..c51104f83b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@curefit/react-native-video",
-    "version": "5.1.4",
+    "version": "5.1.5",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",

From 1f3396270fb12c54cc62d864153b7700ce836426 Mon Sep 17 00:00:00 2001
From: Param Aggarwal <paramaggarwal@gmail.com>
Date: Wed, 15 Jul 2020 12:38:06 +0530
Subject: [PATCH 37/41] Update ReactVideoView.java

---
 android/src/main/java/com/brentvatne/react/ReactVideoView.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/src/main/java/com/brentvatne/react/ReactVideoView.java b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
index 9f49920fc6..f3f5fe7b07 100644
--- a/android/src/main/java/com/brentvatne/react/ReactVideoView.java
+++ b/android/src/main/java/com/brentvatne/react/ReactVideoView.java
@@ -163,7 +163,6 @@ public void run() {
                     event.putDouble(EVENT_PROP_CURRENT_TIME, mMediaPlayer.getCurrentPosition() / 1000.0);
                     event.putDouble(EVENT_PROP_PLAYABLE_DURATION, mVideoBufferedDuration / 1000.0); //TODO:mBufferUpdateRunnable
                     event.putDouble(EVENT_PROP_SEEKABLE_DURATION, mVideoDuration / 1000.0);
-                    // event.putDouble(EVENT_PROP_CURRENT_TIME+"2", mMediaPlayer.getPositionInFirstPeriodMs());
                     mEventEmitter.receiveEvent(getId(), Events.EVENT_PROGRESS.toString(), event);
 
                     // Check for update after an interval

From b26456193a55606a8c4cde3566b5e2ee57835420 Mon Sep 17 00:00:00 2001
From: Param Aggarwal <paramaggarwal@gmail.com>
Date: Wed, 15 Jul 2020 12:38:37 +0530
Subject: [PATCH 38/41] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7b44084334..1ae4fb2563 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/curefit/react-native-video.git"
+        "url": "git@github.com:react-native-community/react-native-video.git"
     },
     "devDependencies": {
         "@react-native-community/eslint-config": "0.0.7",

From bd62bc4d8f8752cf04c4a15c525dd13e804c9574 Mon Sep 17 00:00:00 2001
From: Param Aggarwal <paramaggarwal@gmail.com>
Date: Wed, 15 Jul 2020 12:39:05 +0530
Subject: [PATCH 39/41] Update ReactExoplayerView.java

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index ee805cc953..b30ad71223 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -88,6 +88,7 @@ class ReactExoplayerView extends FrameLayout implements
 
     static {
         DEFAULT_COOKIE_MANAGER = new CookieManager();
+        DEFAULT_COOKIE_MANAGER.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
     }
 
     private final VideoEventEmitter eventEmitter;

From ca06af233dc68454b44053abf5e09087fbd7890f Mon Sep 17 00:00:00 2001
From: Param Aggarwal <paramaggarwal@gmail.com>
Date: Wed, 15 Jul 2020 12:39:34 +0530
Subject: [PATCH 40/41] Update ReactExoplayerView.java

---
 .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index b30ad71223..fd7a36a524 100644
--- a/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -141,7 +141,7 @@ class ReactExoplayerView extends FrameLayout implements
     private boolean playInBackground = false;
     private Map<String, String> requestHeaders;
     private boolean mReportBandwidth = false;
-    private String mCookiePolicy = "all";
+    private String mCookiePolicy = "original";
     private boolean controls;
     // \ End props
 

From 522e51d2b5408065560676614deeff654db9698a Mon Sep 17 00:00:00 2001
From: Param Aggarwal <paramaggarwal@gmail.com>
Date: Wed, 15 Jul 2020 12:45:27 +0530
Subject: [PATCH 41/41] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45f586a3ee..cc6c0b8eeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Reverted the JS fullscreening for Android. [#2013](https://github.com/react-native-community/react-native-video/pull/2013)
 - Set iOS request headers without needing to edit RCTVideo.m. [#2014](https://github.com/react-native-community/react-native-video/pull/2014)
 - Fix exoplayer aspect ratio update on source changes [#2053](https://github.com/react-native-community/react-native-video/pull/2053)
+- Added `cookiePolicy` property for ExoPlayer CookieManager [#2082](https://github.com/react-native-community/react-native-video/pull/2082)
 
 ### Version 5.1.0-alpha5