Merge branch 'master' into implement-ios-caching (6cfea3aa) · Commits · codevise / react-native-video

.github/ISSUE_TEMPLATE.md

0 → 100644

+19 −0

Changes for .github/ISSUE_TEMPLATE.md: 19 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		### Current behavior
		Describe what happens when you encounter this issue.

		### Reproduction steps
		A 1, 2, 3, etc. list of what's needed to see the issue happen.

		### Expected behavior
		Describe what you wanted to happen

		### Platform
		Which player are you experiencing the problem on:
		* iOS
		* Android ExoPlayer
		* Android MediaPlayer
		* Windows UWP
		* Windows WPF

		### Video sample
		If possible, include a link to the video that has the problem that can be streamed or downloaded from.

CHANGELOG.md

0 → 100644

+36 −0

Changes for CHANGELOG.md: 36 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		## Changelog

		### Version 3.1.0
		* Support sidecar text tracks on iOS [#1109](https://github.com/react-native-community/react-native-video/pull/1109)
		* Support onAudioBecomingNoisy on iOS [#1131](https://github.com/react-native-community/react-native-video/pull/1131)

		### Version 3.0
		* Inherit Android buildtools and SDK version from the root project [#1081](https://github.com/react-native-community/react-native-video/pull/1081)
		* Automatically play on ExoPlayer when the paused prop is not set [#1083](https://github.com/react-native-community/react-native-video/pull/1083)
		* Preserve Android MediaPlayer paused prop when backgrounding [#1082](https://github.com/react-native-community/react-native-video/pull/1082)
		* Support specifying headers on ExoPlayer as part of the source [#805](https://github.com/react-native-community/react-native-video/pull/805)
		* Prevent iOS onLoad event during seeking [#1088](https://github.com/react-native-community/react-native-video/pull/1088)
		* ExoPlayer playableDuration incorrect [#1089](https://github.com/react-native-community/react-native-video/pull/1089)

		### Version 2.3.1
		* Revert PR to inherit Android SDK versions from root project. Re-add in 3.0 [#1080](https://github.com/react-native-community/react-native-video/pull/1080)

		### Version 2.3.0
		* Support allowsExternalPlayback on iOS [#1057](https://github.com/react-native-community/react-native-video/pull/1057)
		* Inherit Android buildtools and SDK version from the root project [#999](https://github.com/react-native-community/react-native-video/pull/999)
		* Fix bug that caused ExoPlayer to start paused if playInBackground was set [#833](https://github.com/react-native-community/react-native-video/pull/833)
		* Fix crash if clearing an observer on iOS that was already cleared [#1075](https://github.com/react-native-community/react-native-video/pull/1075)
		* Add audioOnly prop for music files [#1039](https://github.com/react-native-community/react-native-video/pull/1039)
		* Support seeking with more exact tolerance on iOS [#1076](https://github.com/react-native-community/react-native-video/pull/1076)

		### Version 2.2.0
		* Text track selection support for iOS & ExoPlayer [#1049](https://github.com/react-native-community/react-native-video/pull/1049)
		* Support outputting to a TextureView on Android ExoPlayer [#1058](https://github.com/react-native-community/react-native-video/pull/1058)
		* Support changing the left/right balance on Android MediaPlayer [#1051](https://github.com/react-native-community/react-native-video/pull/1051)
		* Prevent multiple onEnd notifications on iOS [#832](https://github.com/react-native-community/react-native-video/pull/832)
		* Fix doing a partial swipe on iOS causing a black screen [#1048](https://github.com/react-native-community/react-native-video/pull/1048)
		* Fix crash when switching to a new source on iOS [#974](https://github.com/react-native-community/react-native-video/pull/974)
		* Add cookie support for ExoPlayer [#922](https://github.com/react-native-community/react-native-video/pull/922)
		* Remove ExoPlayer onMetadata that wasn't being used [#1040](https://github.com/react-native-community/react-native-video/pull/1040)
		* Fix bug where setting the progress interval on iOS didn't work [#800](https://github.com/react-native-community/react-native-video/pull/800)
		* Support setting the poster resize mode [#595](https://github.com/react-native-community/react-native-video/pull/595)

README.md

+496 −69

File changed.

Preview size limit exceeded, changes collapsed.

TextTrackType.js

0 → 100644

+7 −0

Changes for TextTrackType.js: 7 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		import keyMirror from 'keymirror';

		export default {
		SRT: 'application/x-subrip',
		TTML: 'application/ttml+xml',
		VTT: 'text/vtt'
		};

Video.js

+71 −6

Changes for Video.js: 71 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		import React, {Component} from 'react';
		import PropTypes from 'prop-types';
		import {StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image} from 'react-native';
		import {StyleSheet, requireNativeComponent, NativeModules, View, ViewPropTypes, Image, Platform} from 'react-native';
		import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource';
		import TextTrackType from './TextTrackType';
		import VideoResizeMode from './VideoResizeMode.js';

		const styles = StyleSheet.create({
		@@ -10,6 +11,8 @@ const styles = StyleSheet.create({
		},
		});

		export { TextTrackType };

		export default class Video extends Component {

		constructor(props) {
		@@ -24,8 +27,40 @@ export default class Video extends Component {
		this._root.setNativeProps(nativeProps);
		}

		seek = (time) => {
		toTypeString(x) {
		switch (typeof x) {
		case "object":
		return x instanceof Date
		? x.toISOString()
		: JSON.stringify(x); // object, null
		case "undefined":
		return "";
		default: // boolean, number, string
		return x.toString();
		}
		}

		stringsOnlyObject(obj) {
		const strObj = {};

		Object.keys(obj).forEach(x => {
		strObj[x] = this.toTypeString(obj[x]);
		});

		return strObj;
		}

		seek = (time, tolerance = 100) => {
		if (Platform.OS === 'ios') {
		this.setNativeProps({
		seek: {
		time,
		tolerance
		}
		});
		} else {
		this.setNativeProps({ seek: time });
		}
		};

		presentFullscreenPlayer = () => {
		@@ -65,7 +100,7 @@ export default class Video extends Component {
		};

		_onSeek = (event) => {
		if (this.state.showPoster) {
		if (this.state.showPoster && !this.props.audioOnly) {
		this.setState({showPoster: false});
		}

		@@ -129,7 +164,7 @@ export default class Video extends Component {
		};

		_onPlaybackRateChange = (event) => {
		if (this.state.showPoster && (event.nativeEvent.playbackRate !== 0)) {
		if (this.state.showPoster && event.nativeEvent.playbackRate !== 0 && !this.props.audioOnly) {
		this.setState({showPoster: false});
		}

		@@ -190,6 +225,7 @@ export default class Video extends Component {
		type: source.type \|\| '',
		mainVer: source.mainVer \|\| 0,
		patchVer: source.patchVer \|\| 0,
		requestHeaders: source.headers ? this.stringsOnlyObject(source.headers) : {}
		},
		onVideoLoadStart: this._onLoadStart,
		onVideoLoad: this._onLoad,
		@@ -199,6 +235,7 @@ export default class Video extends Component {
		onVideoEnd: this._onEnd,
		onVideoBuffer: this._onBuffer,
		onTimedMetadata: this._onTimedMetadata,
		onVideoAudioBecomingNoisy: this._onAudioBecomingNoisy,
		onVideoFullscreenPlayerWillPresent: this._onFullscreenPlayerWillPresent,
		onVideoFullscreenPlayerDidPresent: this._onFullscreenPlayerDidPresent,
		onVideoFullscreenPlayerWillDismiss: this._onFullscreenPlayerWillDismiss,
		@@ -218,7 +255,7 @@ export default class Video extends Component {
		top: 0,
		right: 0,
		bottom: 0,
		resizeMode: 'contain',
		resizeMode: this.props.posterResizeMode \|\| 'contain'
		};

		return (
		@@ -248,7 +285,10 @@ Video.propTypes = {
		/* Native only */
		src: PropTypes.object,
		cache: PropTypes.bool,
		seek: PropTypes.number,
		seek: PropTypes.oneOfType([
		PropTypes.number,
		PropTypes.object
		]),
		fullscreen: PropTypes.bool,
		onVideoLoadStart: PropTypes.func,
		onVideoLoad: PropTypes.func,
		@@ -258,6 +298,7 @@ Video.propTypes = {
		onVideoSeek: PropTypes.func,
		onVideoEnd: PropTypes.func,
		onTimedMetadata: PropTypes.func,
		onVideoAudioBecomingNoisy: PropTypes.func,
		onVideoFullscreenPlayerWillPresent: PropTypes.func,
		onVideoFullscreenPlayerDidPresent: PropTypes.func,
		onVideoFullscreenPlayerWillDismiss: PropTypes.func,
		@@ -273,18 +314,42 @@ Video.propTypes = {
		]),
		resizeMode: PropTypes.string,
		poster: PropTypes.string,
		posterResizeMode: Image.propTypes.resizeMode,
		repeat: PropTypes.bool,
		allowsExternalPlayback: PropTypes.bool,
		selectedTextTrack: PropTypes.shape({
		type: PropTypes.string.isRequired,
		value: PropTypes.oneOfType([
		PropTypes.string,
		PropTypes.number
		])
		}),
		textTracks: PropTypes.arrayOf(
		PropTypes.shape({
		title: PropTypes.string,
		uri: PropTypes.string.isRequired,
		type: PropTypes.oneOf([
		TextTrackType.SRT,
		TextTrackType.TTML,
		TextTrackType.VTT,
		]),
		language: PropTypes.string.isRequired
		})
		),
		paused: PropTypes.bool,
		muted: PropTypes.bool,
		volume: PropTypes.number,
		stereoPan: PropTypes.number,
		rate: PropTypes.number,
		playInBackground: PropTypes.bool,
		playWhenInactive: PropTypes.bool,
		ignoreSilentSwitch: PropTypes.oneOf(['ignore', 'obey']),
		disableFocus: PropTypes.bool,
		controls: PropTypes.bool,
		audioOnly: PropTypes.bool,
		currentTime: PropTypes.number,
		progressUpdateInterval: PropTypes.number,
		useTextureView: PropTypes.bool,
		onLoadStart: PropTypes.func,
		onLoad: PropTypes.func,
		onBuffer: PropTypes.func,