Merge branch 'upstream-master' (5b3f0878) · Commits · codevise / react-native-video

CHANGELOG.md

+9 −0

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

		### 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)

		### Version 3.2.0
		* Basic fullscreen support for Android MediaPlayer [#1138](https://github.com/react-native-community/react-native-video/pull/1138)
		* Simplify default Android SDK code [#1145](https://github.com/react-native-community/react-native-video/pull/1145) [#1146](https://github.com/react-native-community/react-native-video/pull/1146)
		* Various iOS sideloaded text track fixes [#1157](https://github.com/react-native-community/react-native-video/pull/1157)
		* Fix #1150 where assets with bundled assets don't work on iOS in release mode [#1162](https://github.com/react-native-community/react-native-video/pull/1162)
		* Support configuring the buffer on Android ExoPlayer [#1160](https://github.com/react-native-community/react-native-video/pull/1160)
		* Prevent sleep from sleeping while videos are playing on Android MediaPlayer [#1117](https://github.com/react-native-community/react-native-video/pull/1117)
		* Update NewtonSoft JSON to match react-native-windows version [#1169](https://github.com/react-native-community/react-native-video/pull/1169)

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

README.md

+33 −3

Changes for README.md: 33 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,9 +3,12 @@
		A `<Video>` component for react-native, as seen in
		[react-native-login](https://github.com/brentvatne/react-native-login)!

		Requires react-native >= 0.40.0, for RN support of 0.19.0 - 0.39.0 please use a pre 1.0 version.
		Requires react-native >= 0.40.0

		### Version 3.0 breaking changes
		### Version 4.0.0 breaking changes
		Version 4.0.0 now requires Android SDK 26 or higher to use ExoPlayer. This is the default version as of React Native 0.56 and will be required by Google for all apps in October 2018.

		### Version 3.0.0 breaking changes
		Version 3.0 features a number of changes to existing behavior. See [Updating](#updating) for changes.

		## TOC
		@@ -210,6 +213,7 @@ var styles = StyleSheet.create({
		### Configurable props
		* [allowsExternalPlayback](#allowsexternalplayback)
		* [audioOnly](#audioonly)
		* [bufferConfig](#bufferconfig)
		* [ignoreSilentSwitch](#ignoresilentswitch)
		* [muted](#muted)
		* [paused](#paused)
		@@ -262,6 +266,30 @@ For this to work, the poster prop must be set.

		Platforms: all

		#### bufferConfig
		Adjust the buffer settings. This prop takes an object with one or more of the properties listed below.

		Property \| Type \| Description
		--- \| --- \| ---
		minBufferMs \| number \| The default minimum duration of media that the player will attempt to ensure is buffered at all times, in milliseconds.
		maxBufferMs \| number \| The default maximum duration of media that the player will attempt to buffer, in milliseconds.
		bufferForPlaybackMs \| number \| The default duration of media that must be buffered for playback to start or resume following a user action such as a seek, in milliseconds.
		playbackAfterRebufferMs \| number \| The default duration of media that must be buffered for playback to resume after a rebuffer, in milliseconds. A rebuffer is defined to be caused by buffer depletion rather than a user action.

		This prop should only be set when you are setting the source, changing it after the media is loaded will cause it to be reloaded.

		Example with default values:
		```
		bufferConfig={{
		minBufferMs: 15000,
		maxBufferMs: 50000,
		bufferForPlaybackMs: 2500,
		bufferForPlaybackAfterRebufferMs: 5000
		}}
		```

		Platforms: Android ExoPlayer

		#### ignoreSilentSwitch
		Controls the iOS silent switch behavior
		* "inherit" (default) - Use the default AVPlayer behavior
		@@ -617,7 +645,9 @@ Example:
		}
		```

		Platforms: Android ExoPlayer, iOS
		Support for timed metadata on Android MediaPlayer is limited at best and only compatible with some videos. It requires a target SDK of 23 or higher.

		Platforms: Android ExoPlayer, Android MediaPlayer, iOS

		### Methods
		Methods operate on a ref to the Video element. You can create a ref using code like:

Video.js

+6 −0

Changes for Video.js: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -350,6 +350,12 @@ Video.propTypes = {
		paused: PropTypes.bool,
		muted: PropTypes.bool,
		volume: PropTypes.number,
		bufferConfig: PropTypes.shape({
		minBufferMs: PropTypes.number,
		maxBufferMs: PropTypes.number,
		bufferForPlaybackMs: PropTypes.number,
		bufferForPlaybackAfterRebufferMs: PropTypes.number,
		}),
		stereoPan: PropTypes.number,
		rate: PropTypes.number,
		playInBackground: PropTypes.bool,

android-exoplayer/build.gradle

+12 −3

Changes for android-exoplayer/build.gradle: 12 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,9 +19,18 @@ android {
		dependencies {
		//noinspection GradleDynamicVersion
		provided "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
		compile 'com.google.android.exoplayer:exoplayer:2.7.3'
		compile('com.google.android.exoplayer:extension-okhttp:2.7.3') {
		compile('com.google.android.exoplayer:exoplayer:2.8.2') {
		exclude group: 'com.android.support'
		}

		// All support libs must use the same version
		compile "com.android.support:support-annotations:${safeExtGet('supportLibVersion', '+')}"
		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') {
		exclude group: 'com.squareup.okhttp3', module: 'okhttp'
		}
		compile 'com.squareup.okhttp3:okhttp:3.9.1'
		compile 'com.squareup.okhttp3:okhttp:3.11.0'

		}

android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

+41 −22

Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java: 41 added lines, 22 removed lines.
Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
		import com.google.android.exoplayer2.trackselection.TrackSelection;
		import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
		import com.google.android.exoplayer2.upstream.DataSource;
		import com.google.android.exoplayer2.upstream.DefaultAllocator;
		import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
		import com.google.android.exoplayer2.util.MimeTypes;
		import com.google.android.exoplayer2.util.Util;
		@@ -97,7 +98,7 @@ class ReactExoplayerView extends FrameLayout implements

		private DataSource.Factory mediaDataSourceFactory;
		private SimpleExoPlayer player;
		private MappingTrackSelector trackSelector;
		private DefaultTrackSelector trackSelector;
		private boolean playerNeedsSource;

		private int resumeWindow;
		@@ -109,6 +110,11 @@ class ReactExoplayerView extends FrameLayout implements
		private boolean isBuffering;
		private float rate = 1f;

		private int minBufferMs = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS;
		private int maxBufferMs = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS;
		private int bufferForPlaybackMs = DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS;
		private int bufferForPlaybackAfterRebufferMs = DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;

		// Props from React
		private Uri srcUri;
		private String extension;
		@@ -234,7 +240,9 @@ class ReactExoplayerView extends FrameLayout implements
		if (player == null) {
		TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(BANDWIDTH_METER);
		trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
		player = ExoPlayerFactory.newSimpleInstance(getContext(), trackSelector, new DefaultLoadControl());
		DefaultAllocator allocator = new DefaultAllocator(true, C.DEFAULT_BUFFER_SEGMENT_SIZE);
		DefaultLoadControl defaultLoadControl = new DefaultLoadControl(allocator, minBufferMs, maxBufferMs, bufferForPlaybackMs, bufferForPlaybackAfterRebufferMs, -1, true);
		player = ExoPlayerFactory.newSimpleInstance(getContext(), trackSelector, defaultLoadControl);
		player.addListener(this);
		player.setMetadataOutput(this);
		exoPlayerView.setPlayer(player);
		@@ -320,7 +328,6 @@ class ReactExoplayerView extends FrameLayout implements

		private void releasePlayer() {
		if (player != null) {
		isPaused = player.getPlayWhenReady();
		updateResumePosition();
		player.release();
		player.setMetadataOutput(null);
		@@ -526,12 +533,12 @@ class ReactExoplayerView extends FrameLayout implements
		TrackGroupArray groups = info.getTrackGroups(index);
		for (int i = 0; i < groups.length; ++i) {
		Format format = groups.get(i).getFormat(0);
		WritableMap textTrack = Arguments.createMap();
		textTrack.putInt("index", i);
		textTrack.putString("title", format.id != null ? format.id : "");
		textTrack.putString("type", format.sampleMimeType);
		textTrack.putString("language", format.language != null ? format.language : "");
		audioTracks.pushMap(textTrack);
		WritableMap audioTrack = Arguments.createMap();
		audioTrack.putInt("index", i);
		audioTrack.putString("title", format.id != null ? format.id : "");
		audioTrack.putString("type", format.sampleMimeType);
		audioTrack.putString("language", format.language != null ? format.language : "");
		audioTracks.pushMap(audioTrack);
		}
		return audioTracks;
		}
		@@ -767,8 +774,13 @@ class ReactExoplayerView extends FrameLayout implements
		type = "default";
		}

		DefaultTrackSelector.Parameters disableParameters = trackSelector.getParameters()
		.buildUpon()
		.setRendererDisabled(rendererIndex, true)
		.build();

		if (type.equals("disabled")) {
		trackSelector.setSelectionOverride(rendererIndex, groups, null);
		trackSelector.setParameters(disableParameters);
		return;
		} else if (type.equals("language")) {
		for (int i = 0; i < groups.length; ++i) {
		@@ -791,32 +803,30 @@ class ReactExoplayerView extends FrameLayout implements
		trackIndex = value.asInt();
		}
		} else { // default
		if (rendererIndex == C.TRACK_TYPE_TEXT) { // Use system settings if possible
		int sdk = android.os.Build.VERSION.SDK_INT;
		if (sdk > 18 && groups.length > 0) {
		if (rendererIndex == C.TRACK_TYPE_TEXT && Util.SDK_INT > 18 && groups.length > 0) {
		// Use system settings if possible
		CaptioningManager captioningManager
		= (CaptioningManager)themedReactContext.getSystemService(Context.CAPTIONING_SERVICE);
		if (captioningManager != null && captioningManager.isEnabled()) {
		trackIndex = getTrackIndexForDefaultLocale(groups);
		}
		} else {
		trackSelector.setSelectionOverride(rendererIndex, groups, null);
		return;
		}
		} else if (rendererIndex == C.TRACK_TYPE_AUDIO) {
		trackIndex = getTrackIndexForDefaultLocale(groups);
		}
		}

		if (trackIndex == C.INDEX_UNSET) {
		trackSelector.clearSelectionOverrides(trackIndex);
		trackSelector.setParameters(disableParameters);
		return;
		}

		MappingTrackSelector.SelectionOverride override
		= new MappingTrackSelector.SelectionOverride(
		new FixedTrackSelection.Factory(), trackIndex, 0);
		trackSelector.setSelectionOverride(rendererIndex, groups, override);
		DefaultTrackSelector.Parameters selectionParameters = trackSelector.getParameters()
		.buildUpon()
		.setRendererDisabled(rendererIndex, false)
		.setSelectionOverride(rendererIndex, groups,
		new DefaultTrackSelector.SelectionOverride(trackIndex, 0))
		.build();
		trackSelector.setParameters(selectionParameters);
		}

		private int getTrackIndexForDefaultLocale(TrackGroupArray groups) {
		@@ -931,4 +941,13 @@ class ReactExoplayerView extends FrameLayout implements
		public void setUseTextureView(boolean useTextureView) {
		exoPlayerView.setUseTextureView(useTextureView);
		}

		public void setBufferConfig(int newMinBufferMs, int newMaxBufferMs, int newBufferForPlaybackMs, int newBufferForPlaybackAfterRebufferMs) {
		minBufferMs = newMinBufferMs;
		maxBufferMs = newMaxBufferMs;
		bufferForPlaybackMs = newBufferForPlaybackMs;
		bufferForPlaybackAfterRebufferMs = newBufferForPlaybackAfterRebufferMs;
		releasePlayer();
		initializePlayer();
		}
		}