From 55e0e4dcfa7f67cdc28ea53738dff46344a9ed04 Mon Sep 17 00:00:00 2001
From: Charlie Martin <cmmartin@users.noreply.github.com>
Date: Sat, 4 Aug 2018 17:28:33 -0400
Subject: [PATCH 01/14] Remove flash between poster and video

This resolves https://github.com/react-native-community/react-native-video/issues/1128
---
 Video.js | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Video.js b/Video.js
index 5c6cd1d3..f351c3ff 100644
--- a/Video.js
+++ b/Video.js
@@ -248,35 +248,21 @@ export default class Video extends Component {
       onAudioBecomingNoisy: this._onAudioBecomingNoisy,
     });
 
-    if (this.props.poster && this.state.showPoster) {
-      const posterStyle = {
-        position: 'absolute',
-        left: 0,
-        top: 0,
-        right: 0,
-        bottom: 0,
-        resizeMode: this.props.posterResizeMode || 'contain'
-      };
-
-      return (
-        <View style={nativeProps.style}>
-          <RCTVideo
-            ref={this._assignRoot}
-            {...nativeProps}
-          />
-          <Image
-            style={posterStyle}
-            source={{uri: this.props.poster}}
-          />
-        </View>
-      );
-    }
+    const posterStyle = {
+      ...StyleSheet.absoluteFillObject,
+      resizeMode: this.props.posterResizeMode || 'contain',
+    };
 
     return (
-      <RCTVideo
-        ref={this._assignRoot}
-        {...nativeProps}
-      />
+      <React.Fragment>
+        <RCTVideo ref={this._assignRoot} {...nativeProps} />
+        {this.props.poster &&
+          this.state.showPoster && (
+            <View style={nativeProps.style}>
+              <Image style={posterStyle} source={{ uri: this.props.poster }} />
+            </View>
+          )}
+      </React.Fragment>
     );
   }
 }

From bbacb953458fffc38cba846d1e5b27e3066e78f1 Mon Sep 17 00:00:00 2001
From: David Narbutovich <vamnemne@gmail.com>
Date: Wed, 12 Sep 2018 11:27:36 +0300
Subject: [PATCH 02/14] Update TextTrackType.js

Remove not needed import
---
 TextTrackType.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/TextTrackType.js b/TextTrackType.js
index caff65a9..9dc14077 100644
--- a/TextTrackType.js
+++ b/TextTrackType.js
@@ -1,5 +1,3 @@
-import keyMirror from 'keymirror';
-
 export default {
   SRT: 'application/x-subrip',
   TTML: 'application/ttml+xml',

From a135dd346e5e847e1f0d4c864ea57a67881a3848 Mon Sep 17 00:00:00 2001
From: David Narbutovich <vamnemne@gmail.com>
Date: Wed, 12 Sep 2018 23:01:28 +0300
Subject: [PATCH 03/14] Reduce package size

---
 .npmignore   |  1 -
 package.json | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
 delete mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 46b411bf..00000000
--- a/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-/examples
diff --git a/package.json b/package.json
index 3051b567..cfef620d 100644
--- a/package.json
+++ b/package.json
@@ -44,5 +44,14 @@
         "android": {
             "sourceDir": "./android-exoplayer"
         }
-    }
+    },
+    "files":[
+        "android-exoplayer",
+        "android",
+        "ios",
+        "windows",
+        "TextTrackType.js",
+        "react-native-video.podspec",
+        "VideoResizeMode.js"
+    ]
 }
\ No newline at end of file

From ea4c732c9593e5db24b1d46d6284a7977d5001f7 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Sat, 22 Sep 2018 15:01:51 -0700
Subject: [PATCH 04/14] Reduce package size

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bc5b674..60460e2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 * Video caching cleanups [#1172](https://github.com/react-native-community/react-native-video/pull/1172)
 * Add ipod-library support [#926](https://github.com/react-native-community/react-native-video/pull/926/files)
 * Fix crash on ExoPlayer when there are no audio tracks [#1233](https://github.com/react-native-community/react-native-video/pull/1233)
+* Reduce package size [#1231](https://github.com/react-native-community/react-native-video/pull/1231)
+* Remove unnecessary import in TextTrackType [#1229](https://github.com/react-native-community/react-native-video/pull/1229)
 
 ### Version 3.2.0
 * Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)

From 584559ea7599e90eb294020c2db888f11fe2fde1 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Sat, 22 Sep 2018 15:03:22 -0700
Subject: [PATCH 05/14] Bump version to 3.2.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3051b567..13e79075 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-video",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "description": "A <Video /> element for react-native",
     "main": "Video.js",
     "license": "MIT",
@@ -45,4 +45,4 @@
             "sourceDir": "./android-exoplayer"
         }
     }
-}
\ No newline at end of file
+}

From d9eef0fd512223d4bc7cd9b9a4b8d3484ad2ac5f Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Thu, 27 Sep 2018 13:55:57 -0700
Subject: [PATCH 06/14] Remove flash between poster and video

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60460e2c..1b7f7ac3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Fix crash on ExoPlayer when there are no audio tracks [#1233](https://github.com/react-native-community/react-native-video/pull/1233)
 * Reduce package size [#1231](https://github.com/react-native-community/react-native-video/pull/1231)
 * Remove unnecessary import in TextTrackType [#1229](https://github.com/react-native-community/react-native-video/pull/1229)
+* Prevent flash between poster and video [#1167](https://github.com/react-native-community/react-native-video/pull/1167)
 
 ### Version 3.2.0
 * Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)

From 75e3a77d591c0a3fcb749366d798c071c76e9d53 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <me@hamptonmaxwell.com>
Date: Thu, 27 Sep 2018 16:03:45 -0700
Subject: [PATCH 07/14] [WIP] Support react-native-dom (#1253)

Add support for react-native-dom
---
 README.md              |  25 +++++
 dom/LICENSE.md         |   9 ++
 dom/RCTVideo.js        | 245 +++++++++++++++++++++++++++++++++++++++++
 dom/RCTVideoEvent.js   |  56 ++++++++++
 dom/RCTVideoManager.js |  77 +++++++++++++
 dom/index.js           |   3 +
 dom/resizeModes.js     |   8 ++
 dom/types.js           |  10 ++
 8 files changed, 433 insertions(+)
 create mode 100644 dom/LICENSE.md
 create mode 100644 dom/RCTVideo.js
 create mode 100644 dom/RCTVideoEvent.js
 create mode 100644 dom/RCTVideoManager.js
 create mode 100644 dom/index.js
 create mode 100644 dom/resizeModes.js
 create mode 100644 dom/types.js

diff --git a/README.md b/README.md
index c1dd0f0f..73c3d34b 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,31 @@ using System.Collections.Generic;
 ```
 </details>
 
+<details>
+  <summary>DOM</summary>
+
+Make the following additions to the given files manually:
+
+**dom/bootstrap.js**
+
+Import RCTVideoManager and add it to the list of nativeModules:
+
+```javascript
+import { RNDomInstance } from "react-native-dom";
+import { name as appName } from "../app.json";
+import RCTVideoManager from 'react-native-video/dom/RCTVideoManager'; // Add this
+
+// Path to RN Bundle Entrypoint ================================================
+const rnBundlePath = "./entry.bundle?platform=dom&dev=true";
+
+// React Native DOM Runtime Options =============================================
+const ReactNativeDomOptions = {
+  enableHotReload: false,
+  nativeModules: [RCTVideoManager] // Add this
+};
+```
+</details>
+
 ## Usage
 
 ```javascript
diff --git a/dom/LICENSE.md b/dom/LICENSE.md
new file mode 100644
index 00000000..aa185c82
--- /dev/null
+++ b/dom/LICENSE.md
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2018 Vincent Riemer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js
new file mode 100644
index 00000000..db6fc55e
--- /dev/null
+++ b/dom/RCTVideo.js
@@ -0,0 +1,245 @@
+// @flow
+
+import { RCTEvent, RCTView, type RCTBridge } from "react-native-dom";
+
+import resizeModes from "./resizeModes";
+import type { VideoSource } from "./types";
+import RCTVideoEvent from "./RCTVideoEvent";
+
+class RCTVideo extends RCTView {
+  playPromise: Promise<void> = Promise.resolve();
+  progressTimer: number;
+  videoElement: HTMLVideoElement;
+
+  onEnd: boolean = false;
+  onLoad: boolean = false;
+  onLoadStart: boolean = false;
+  onProgress: boolean = false;
+
+  _paused: boolean = false;
+  _progressUpdateInterval: number = 250.0;
+  _savedVolume: number = 1.0;
+
+  constructor(bridge: RCTBridge) {
+    super(bridge);
+
+    this.eventDispatcher = bridge.getModuleByName("EventDispatcher");
+
+    this.onEnd = this.onEnd.bind(this);
+    this.onLoad = this.onLoad.bind(this);
+    this.onLoadStart = this.onLoadStart.bind(this);
+    this.onPlay = this.onPlay.bind(this);
+    this.onProgress = this.onProgress.bind(this);
+
+    this.videoElement = this.initializeVideoElement();
+    this.videoElement.addEventListener("ended", this.onEnd);
+    this.videoElement.addEventListener("loadeddata", this.onLoad);
+    this.videoElement.addEventListener("loadstart", this.onLoadStart);
+    this.videoElement.addEventListener("pause", this.onPause);
+    this.videoElement.addEventListener("play", this.onPlay);
+
+    this.muted = false;
+    this.rate = 1.0;
+    this.volume = 1.0;
+    this.childContainer.appendChild(this.videoElement);
+  }
+
+  detachFromView(view: UIView) {
+    this.videoElement.removeEventListener("ended", this.onEnd);
+    this.videoElement.removeEventListener("loadeddata", this.onLoad);
+    this.videoElement.removeEventListener("loadstart", this.onLoadStart);
+    this.videoElement.removeEventListener("pause", this.onPause);
+    this.videoElement.removeEventListener("play", this.onPlay);
+
+    this.stopProgressTimer();
+  }
+
+  initializeVideoElement() {
+    const elem = document.createElement("video");
+
+    Object.assign(elem.style, {
+      display: "block",
+      position: "absolute",
+      top: "0",
+      left: "0",
+      width: "100%",
+      height: "100%"
+    });
+
+    return elem;
+  }
+
+  presentFullscreenPlayer() {
+    console.log("V PF");
+    this.videoElement.webkitRequestFullScreen();
+  }
+
+  set controls(value: boolean) {
+    if (value) {
+      this.videoElement.controls = true;
+      this.videoElement.style.pointerEvents = "auto";
+    } else {
+      this.videoElement.controls = false;
+      this.videoElement.style.pointerEvents = "";
+    }
+  }
+
+  set muted(value: boolean) {
+    if (value) {
+      this.videoElement.muted = true;
+    } else {
+      this.videoElement.muted = false;
+    }
+  }
+
+  set paused(value: boolean) {
+    this.playPromise.then(() => {
+      if (value) {
+        this.videoElement.pause();
+      } else {
+        this.playPromise = this.videoElement.play().catch(console.error);
+      }
+    });
+    this._paused = value;
+  }
+
+  set progressUpdateInterval(value: number) {
+    this._progressUpdateInterval = value;
+    this.stopProgressTimer();
+    this.startProgressTimer();
+  }
+
+  set rate(value: number) {
+    this.videoElement.defaultPlaybackRate = value; // playbackRate doesn't work on Chrome
+    this.videoElement.playbackRate = value;
+  }
+
+  set repeat(value: boolean) {
+    if (value) {
+      this.videoElement.setAttribute("loop", "true");
+    } else {
+      this.videoElement.removeAttribute("loop");
+    }
+  }
+
+  set resizeMode(value: number) {
+    switch (value) {
+      case resizeModes.ScaleNone: {
+        this.videoElement.style.objectFit = "none";
+        break;
+      }
+      case resizeModes.ScaleToFill: {
+        this.videoElement.style.objectFit = "fill";
+        break;
+      }
+      case resizeModes.ScaleAspectFit: {
+        this.videoElement.style.objectFit = "contain";
+        break;
+      }
+      case resizeModes.ScaleAspectFill: {
+        this.videoElement.style.objectFit = "cover";
+        break;
+      }
+    }
+  }
+
+  set seek(value: number) {
+    this.videoElement.currentTime = value;
+  }
+
+  set source(value: VideoSource) {
+    let uri = value.uri;
+
+    if (uri.startsWith("blob:")) {
+      let blob = this.bridge.blobManager.resolveURL(uri);
+      if (blob.type === "text/xml") {
+        blob = new Blob([blob], { type: "video/mp4" });
+      }
+      uri = URL.createObjectURL(blob);
+    }
+
+    this.videoElement.setAttribute("src", uri);
+    if (!this._paused) {
+      this.playPromise = this.videoElement.play();
+    }
+  }
+
+  set volume(value: number) {
+    if (value === 0) {
+      this.muted = true;
+    } else {
+      this.videoElement.volume = value;
+      this.muted = false;
+    }
+  }
+
+  onEnd = () => {
+    this.onProgress();
+    this.sendEvent("topVideoEnd", null);
+    this.stopProgressTimer();    
+  }
+
+  onLoad = () => {
+    // height & width are safe with audio, will be 0
+    const height = this.videoElement.videoHeight;
+    const width = this.videoElement.videoWidth;
+    const payload = {
+      currentPosition: this.videoElement.currentTime,
+      duration: this.videoElement.duration,
+      naturalSize: {
+        width,
+        height,
+        orientation: width >= height ? "landscape" : "portrait"
+      }
+    };
+    this.sendEvent("topVideoLoad", payload);
+  }
+
+  onLoadStart = () => {
+    const src = this.videoElement.currentSrc;
+    const payload = {
+      isNetwork: !src.match(/^https?:\/\/localhost/), // require is served from localhost
+      uri: this.videoElement.currentSrc
+    };
+    this.sendEvent("topVideoLoadStart", payload);
+  }
+
+  onPause = () => {
+    this.stopProgressTimer();
+  }
+
+  onPlay = () => {
+    this.startProgressTimer();
+  }
+
+  onProgress = () => {
+    const payload = {
+      currentTime: this.videoElement.currentTime,
+      duration: this.videoElement.duration
+    };
+    this.sendEvent("topVideoProgress", payload);
+  }
+
+  sendEvent(eventName, payload) {
+    const event = new RCTVideoEvent(eventName, this.reactTag, 0, payload);
+    this.eventDispatcher.sendEvent(event);
+  }
+
+  startProgressTimer() {
+    if (!this.progressTimer && this._progressUpdateInterval) {
+      this.onProgress();
+      this.progressTimer = setInterval(this.onProgress, this._progressUpdateInterval);
+    }
+  }
+
+  stopProgressTimer() {
+    if (this.progressTimer) {
+      clearInterval(this.progressTimer);
+      this.progressTimer = null;
+    }
+  }
+}
+
+customElements.define("rct-video", RCTVideo);
+
+export default RCTVideo;
diff --git a/dom/RCTVideoEvent.js b/dom/RCTVideoEvent.js
new file mode 100644
index 00000000..699a88c4
--- /dev/null
+++ b/dom/RCTVideoEvent.js
@@ -0,0 +1,56 @@
+// import { RCTEvent } from "react-native-dom";
+
+interface RCTEvent {
+    viewTag: number;
+    eventName: string;
+    coalescingKey: number;
+  
+    canCoalesce(): boolean;
+    coalesceWithEvent(event: RCTEvent): RCTEvent;
+  
+    moduleDotMethod(): string;
+    arguments(): Array<any>;
+  }
+
+export default class RCTVideoEvent implements RCTEvent {
+  viewTag: number;
+  eventName: string;
+  coalescingKey: number;
+
+  constructor(
+    eventName: string,
+    reactTag: number,
+    coalescingKey: number,
+    data: ?Object
+  ) {
+    this.viewTag = reactTag;
+    this.eventName = eventName;
+    this.coalescingKey = coalescingKey;
+    this.data = data;
+  }
+
+  canCoalesce(): boolean {
+    return false;
+  }
+
+  coalesceWithEvent(event: RCTEvent): RCTEvent {
+    return;
+  }
+
+  moduleDotMethod(): string {
+    return "RCTEventEmitter.receiveEvent";
+  }
+
+  arguments(): Array<any> {
+    const args = [
+      this.viewTag,
+      this.eventName,
+      this.data
+    ];
+    return args;
+  }
+
+  coalescingKey(): number {
+    return this.coalescingKey;
+  }
+}
diff --git a/dom/RCTVideoManager.js b/dom/RCTVideoManager.js
new file mode 100644
index 00000000..b5b3f3f3
--- /dev/null
+++ b/dom/RCTVideoManager.js
@@ -0,0 +1,77 @@
+// @flow
+
+import { RCTViewManager } from "react-native-dom";
+
+import RCTVideo from "./RCTVideo";
+import resizeModes from "./resizeModes";
+
+import type { VideoSource } from "./types";
+
+class RCTVideoManager extends RCTViewManager {
+  static moduleName = "RCTVideoManager";
+
+  view() {
+    return new RCTVideo(this.bridge);
+  }
+
+  describeProps() {
+    return super
+      .describeProps()
+      .addBooleanProp("controls", this.setControls)
+      .addBooleanProp("muted", this.setMuted)
+      .addBooleanProp("paused", this.setPaused)
+      .addNumberProp("progressUpdateInterval", this.setProgressUpdateInterval)
+      .addBooleanProp("rate", this.setRate)
+      .addBooleanProp("repeat", this.setRepeat)
+      .addNumberProp("resizeMode", this.setResizeMode)
+      .addNumberProp("seek", this.setSeek)
+      .addObjectProp("src", this.setSource)
+      .addNumberProp("volume", this.setVolume)
+      .addDirectEvent("onVideoEnd")
+      .addDirectEvent("onVideoLoad")
+      .addDirectEvent("onVideoLoadStart")
+      .addDirectEvent("onVideoProgress");
+  }
+
+  presentFullscreenPlayer() {
+    // not currently working
+  }
+
+  setControls(view: RCTVideo, value: boolean) {
+    view.controls = value;
+  }
+
+  setMuted(view: RCTVideo, value: boolean) {
+    view.muted = value;
+  }
+
+  setPaused(view: RCTVideo, value: boolean) {
+    view.paused = value;
+  }
+
+  setRate(view: RCTVideo, value: number) {
+    view.rate = value;
+  }
+
+  setRepeat(view: RCTVideo, value: boolean) {
+    view.repeat = value;
+  }
+
+  setResizeMode(view: RCTVideo, value: number) {
+    view.resizeMode = value;
+  }
+
+  setSeek(view: RCTVideo, value: number) {
+    view.seek = value;
+  }
+
+  setSource(view: RCTVideo, value: VideoSource) {
+    view.source = value;
+  }
+
+  constantsToExport() {
+    return { ...resizeModes };
+  }
+}
+
+export default RCTVideoManager;
diff --git a/dom/index.js b/dom/index.js
new file mode 100644
index 00000000..d68d5bba
--- /dev/null
+++ b/dom/index.js
@@ -0,0 +1,3 @@
+// @flow
+
+module.exports = require("./RCTVideoManager");
diff --git a/dom/resizeModes.js b/dom/resizeModes.js
new file mode 100644
index 00000000..5f569e0d
--- /dev/null
+++ b/dom/resizeModes.js
@@ -0,0 +1,8 @@
+// @flow
+
+export default {
+  ScaleNone: 0,
+  ScaleToFill: 1,
+  ScaleAspectFit: 2,
+  ScaleAspectFill: 3,
+};
diff --git a/dom/types.js b/dom/types.js
new file mode 100644
index 00000000..fe1d1a15
--- /dev/null
+++ b/dom/types.js
@@ -0,0 +1,10 @@
+// @flow
+
+export type VideoSource = {
+  uri: string,
+  type: string,
+  mainVer: number,
+  patchVer: number,
+  isNetwork: boolean,
+  isAsset: boolean,
+};

From fae09eb4cf7c9857c9eaf2ff9f32082ed2a8076a Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Thu, 27 Sep 2018 16:07:11 -0700
Subject: [PATCH 08/14] Support react-native-dom

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b7f7ac3..28b56e3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Reduce package size [#1231](https://github.com/react-native-community/react-native-video/pull/1231)
 * Remove unnecessary import in TextTrackType [#1229](https://github.com/react-native-community/react-native-video/pull/1229)
 * Prevent flash between poster and video [#1167](https://github.com/react-native-community/react-native-video/pull/1167)
+* Support react-native-dom [#1253](https://github.com/react-native-community/react-native-video/pull/1253)
 
 ### Version 3.2.0
 * Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)

From 53ed7e168e931b8696ac1bf525a3fd4823646666 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Thu, 27 Sep 2018 16:07:16 -0700
Subject: [PATCH 09/14] Fix some typos and add docs for controls & onEnd

---
 README.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 73c3d34b..178a54b0 100644
--- a/README.md
+++ b/README.md
@@ -233,7 +233,6 @@ import Video from 'react-native-video';
          this.player = ref
        }}                                      // Store reference
        onBuffer={this.onBuffer}                // Callback when remote video is buffering
-       onEnd={this.onEnd}                      // Callback when playback finishes
        onError={this.videoError}               // Callback when video cannot be loaded
        style={styles.backgroundVideo} />
 
@@ -253,6 +252,7 @@ var styles = StyleSheet.create({
 * [allowsExternalPlayback](#allowsexternalplayback)
 * [audioOnly](#audioonly)
 * [bufferConfig](#bufferconfig)
+* [controls](#controls)
 * [ignoreSilentSwitch](#ignoresilentswitch)
 * [muted](#muted)
 * [paused](#paused)
@@ -274,6 +274,7 @@ var styles = StyleSheet.create({
 
 ### Event props
 * [onAudioBecomingNoisy](#onaudiobecomingnoisy)
+* [onEnd](#onend)
 * [onFullscreenPlayerWillPresent](#onfullscreenplayerwillpresent)
 * [onFullscreenPlayerDidPresent](#onfullscreenplayerdidpresent)
 * [onFullscreenPlayerWillDismiss](#onfullscreenplayerwilldismiss)
@@ -330,6 +331,15 @@ bufferConfig={{
 
 Platforms: Android ExoPlayer
 
+#### controls
+Determines whether to show player controls.
+* ** false (default)** - Don't show player controls
+* **true** - Show player controls
+
+Note on iOS, controls are always shown when in fullscreen mode.
+
+Platforms: DOM, iOS
+
 #### ignoreSilentSwitch
 Controls the iOS silent switch behavior
 * **"inherit" (default)** - Use the default AVPlayer behavior
@@ -611,6 +621,13 @@ Payload: none
 
 Platforms: Android ExoPlayer, iOS
 
+#### onEnd
+Callback function that is called when the player reaches the end of the media.
+
+Payload: none
+
+Platforms: all
+
 #### onFullscreenPlayerWillPresent
 Callback function that is called when the player is about to enter fullscreen mode.
 
@@ -722,6 +739,8 @@ Example:
 }
 ```
 
+Platforms: all
+
 #### onTimedMetadata
 Callback function that is called when timed metadata becomes available
 
@@ -767,7 +786,7 @@ this.player.dismissFullscreenPlayer();
 
 Platforms: Android ExoPlayer, Android MediaPlayer, iOS
 
-#### FullscreenPlayer
+#### presentFullscreenPlayer
 `presentFullscreenPlayer()`
 
 Put the player in fullscreen mode.

From 8bda6546e878f31d0e8eb778e099d703ce646dd5 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Fri, 28 Sep 2018 10:30:24 -0700
Subject: [PATCH 10/14] Document headers prop

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 178a54b0..d1094d54 100644
--- a/README.md
+++ b/README.md
@@ -253,6 +253,7 @@ var styles = StyleSheet.create({
 * [audioOnly](#audioonly)
 * [bufferConfig](#bufferconfig)
 * [controls](#controls)
+* [headers](#headers)
 * [ignoreSilentSwitch](#ignoresilentswitch)
 * [muted](#muted)
 * [paused](#paused)
@@ -340,6 +341,21 @@ Note on iOS, controls are always shown when in fullscreen mode.
 
 Platforms: DOM, iOS
 
+#### headers
+Pass headers to the HTTP client. Can be used for authorization.
+
+To enable this on iOS, you will need to manually edit RCTVideo.m and uncomment the header code in the playerItemForSource function. This is because the code used a private API and may cause your app to be rejected by the App Store. Use at your own risk.
+
+Example:
+```
+headers = {{
+  Authorization: 'bearer some-token-value',
+  'X-Custom-Header': 'some value'
+}}
+```
+
+Platforms: Android ExoPlayer
+
 #### ignoreSilentSwitch
 Controls the iOS silent switch behavior
 * **"inherit" (default)** - Use the default AVPlayer behavior

From 1be0db4777cbe5fdb62e7b272940f3a2e851d569 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Fri, 28 Sep 2018 17:07:38 -0700
Subject: [PATCH 11/14] Various cleanups

---
 dom/RCTVideo.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js
index db6fc55e..d6842e55 100644
--- a/dom/RCTVideo.js
+++ b/dom/RCTVideo.js
@@ -41,6 +41,7 @@ class RCTVideo extends RCTView {
     this.muted = false;
     this.rate = 1.0;
     this.volume = 1.0;
+    this.videoElement.autoplay = true;
     this.childContainer.appendChild(this.videoElement);
   }
 
@@ -97,7 +98,7 @@ class RCTVideo extends RCTView {
       if (value) {
         this.videoElement.pause();
       } else {
-        this.playPromise = this.videoElement.play().catch(console.error);
+        this.playPromise = this.videoElement.play();
       }
     });
     this._paused = value;
@@ -106,7 +107,9 @@ class RCTVideo extends RCTView {
   set progressUpdateInterval(value: number) {
     this._progressUpdateInterval = value;
     this.stopProgressTimer();
-    this.startProgressTimer();
+    if (!this._paused) {
+      this.startProgressTimer();
+    }
   }
 
   set rate(value: number) {

From 1ef435a864bac010f16b53742d0c033a43871e6b Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Fri, 28 Sep 2018 17:46:57 -0700
Subject: [PATCH 12/14] Use the right name for progress duration

---
 dom/RCTVideo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/RCTVideo.js b/dom/RCTVideo.js
index d6842e55..b249721f 100644
--- a/dom/RCTVideo.js
+++ b/dom/RCTVideo.js
@@ -218,7 +218,7 @@ class RCTVideo extends RCTView {
   onProgress = () => {
     const payload = {
       currentTime: this.videoElement.currentTime,
-      duration: this.videoElement.duration
+      seekableDuration: this.videoElement.duration
     };
     this.sendEvent("topVideoProgress", payload);
   }

From e50c2ad3140c354fcb906ab584fca08b9672d58f Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Sun, 7 Oct 2018 12:53:58 -0700
Subject: [PATCH 13/14] Update to ExoPlayer 2.8.4

---
 android-exoplayer/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android-exoplayer/build.gradle b/android-exoplayer/build.gradle
index 1fb8c420..85a40e9e 100644
--- a/android-exoplayer/build.gradle
+++ b/android-exoplayer/build.gradle
@@ -19,7 +19,7 @@ android {
 dependencies {
     //noinspection GradleDynamicVersion
     provided "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    compile('com.google.android.exoplayer:exoplayer:2.8.2') {
+    compile('com.google.android.exoplayer:exoplayer:2.8.4') {
         exclude group: 'com.android.support'
     }
 
@@ -28,7 +28,7 @@ dependencies {
     compile "com.android.support:support-compat:${safeExtGet('supportLibVersion', '+')}"
     compile "com.android.support:support-media-compat:${safeExtGet('supportLibVersion', '+')}"
 
-    compile('com.google.android.exoplayer:extension-okhttp:2.8.2') {
+    compile('com.google.android.exoplayer:extension-okhttp:2.8.4') {
         exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
     compile 'com.squareup.okhttp3:okhttp:3.11.0'

From dc0a48fc6fff08bbad76777e0ca9d47e1758ff12 Mon Sep 17 00:00:00 2001
From: Hampton Maxwell <hmaxwell@ellation.com>
Date: Sun, 7 Oct 2018 12:55:34 -0700
Subject: [PATCH 14/14] Update to ExoPlayer 2.8.4

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28b56e3c..3b135762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ### Next Version
 * Partial support for timed metadata on Android MediaPlayer [#707](https://github.com/react-native-community/react-native-video/pull/707)
-* Update to ExoPlayer 2.8.2. Android SDK 26 now required [#1170](https://github.com/react-native-community/react-native-video/pull/1170)
 * Support video caching for iOS [#955](https://github.com/react-native-community/react-native-video/pull/955)
 * Video caching cleanups [#1172](https://github.com/react-native-community/react-native-video/pull/1172)
 * Add ipod-library support [#926](https://github.com/react-native-community/react-native-video/pull/926/files)
@@ -11,6 +10,8 @@
 * Remove unnecessary import in TextTrackType [#1229](https://github.com/react-native-community/react-native-video/pull/1229)
 * Prevent flash between poster and video [#1167](https://github.com/react-native-community/react-native-video/pull/1167)
 * Support react-native-dom [#1253](https://github.com/react-native-community/react-native-video/pull/1253)
+* Update to ExoPlayer 2.8.2. Android SDK 26 now required [#1170](https://github.com/react-native-community/react-native-video/pull/1170)
+* Update to ExoPlayer 2.8.4 [#1266](https://github.com/react-native-community/react-native-video/pull/1266)
 
 ### Version 3.2.0
 * Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)