diff --git a/.npmignore b/.npmignore deleted file mode 100644 index 46b411bf..00000000 --- a/.npmignore +++ /dev/null @@ -1 +0,0 @@ -/examples diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc5b674..3b135762 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,16 @@ ### 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) * 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) +* 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) diff --git a/README.md b/README.md index 31a8f9b5..2915c898 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,31 @@ using System.Collections.Generic; ``` +
+ DOM + +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 +}; +``` +
+ ## Usage ```javascript @@ -208,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} /> @@ -228,6 +252,8 @@ var styles = StyleSheet.create({ * [allowsExternalPlayback](#allowsexternalplayback) * [audioOnly](#audioonly) * [bufferConfig](#bufferconfig) +* [controls](#controls) +* [headers](#headers) * [ignoreSilentSwitch](#ignoresilentswitch) * [muted](#muted) * [paused](#paused) @@ -249,6 +275,7 @@ var styles = StyleSheet.create({ ### Event props * [onAudioBecomingNoisy](#onaudiobecomingnoisy) +* [onEnd](#onend) * [onExternalPlaybackChange](#onexternalplaybackchange) * [onFullscreenPlayerWillPresent](#onfullscreenplayerwillpresent) * [onFullscreenPlayerDidPresent](#onfullscreenplayerdidpresent) @@ -306,6 +333,30 @@ 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 + +#### 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 @@ -587,6 +638,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 + #### onExternalPlaybackChange Callback function that is called when external playback mode for current playing video has changed. Mostly useful when connecting/disconnecting to Apple TV – it's called on connection/disconnection. @@ -594,7 +652,7 @@ Payload: Property | Type | Description --- | --- | --- -isExternalPlaybackActive | boolean | Boolean indicating is external playback mode is active +isExternalPlaybackActive | boolean | Boolean indicating whether external playback mode is active Example: ``` @@ -716,6 +774,8 @@ Example: } ``` +Platforms: all + #### onTimedMetadata Callback function that is called when timed metadata becomes available @@ -761,7 +821,7 @@ this.player.dismissFullscreenPlayer(); Platforms: Android ExoPlayer, Android MediaPlayer, iOS -#### FullscreenPlayer +#### presentFullscreenPlayer `presentFullscreenPlayer()` Put the player in fullscreen mode. 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', diff --git a/Video.js b/Video.js index ad9919b7..76f27dc3 100644 --- a/Video.js +++ b/Video.js @@ -255,35 +255,21 @@ export default class Video extends Component { onExternalPlaybackChange: this._onExternalPlaybackChange, }); - 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 ( - - - - - ); - } + const posterStyle = { + ...StyleSheet.absoluteFillObject, + resizeMode: this.props.posterResizeMode || 'contain', + }; return ( - + + + {this.props.poster && + this.state.showPoster && ( + + + + )} + ); } } 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' 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..b249721f --- /dev/null +++ b/dom/RCTVideo.js @@ -0,0 +1,248 @@ +// @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 = 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.videoElement.autoplay = true; + 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(); + } + }); + this._paused = value; + } + + set progressUpdateInterval(value: number) { + this._progressUpdateInterval = value; + this.stopProgressTimer(); + if (!this._paused) { + 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, + seekableDuration: 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; + } + +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 { + 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, +}; diff --git a/package.json b/package.json index 3051b567..5fc9a51c 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