Unverified Commit 2b99f0e1 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1160 from bvanwijk/configure-default-load-control 

Expose DefaultLoadControl parameters Android ExoPlayer
parents fd6333f8 a60a1277

README.md

+25 −0
Changes for README.md: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ var styles = StyleSheet.create({ 
### Configurable props

* [allowsExternalPlayback](#allowsexternalplayback)

* [audioOnly](#audioonly)

* [bufferConfig](#bufferconfig)

* [ignoreSilentSwitch](#ignoresilentswitch)

* [muted](#muted)

* [paused](#paused)
@@ -262,6 +263,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.



This prop can only be set when you are setting a new source, changing it after the media is loaded will cause it to restart.



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.



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

Video.js

+6 −0
Changes for Video.js: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -345,6 +345,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/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

+18 −2
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java: 18 added lines, 2 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;
@@ -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);
@@ -931,4 +938,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();

    }

}

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

+25 −0
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import com.facebook.react.common.MapBuilder; 
import com.facebook.react.uimanager.ThemedReactContext;

import com.facebook.react.uimanager.ViewGroupManager;

import com.facebook.react.uimanager.annotations.ReactProp;

import com.google.android.exoplayer2.DefaultLoadControl;

import com.google.android.exoplayer2.upstream.RawResourceDataSource;



import java.util.HashMap;
@@ -38,6 +39,11 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi 
    private static final String PROP_PAUSED = "paused";

    private static final String PROP_MUTED = "muted";

    private static final String PROP_VOLUME = "volume";

    private static final String PROP_BUFFER_CONFIG = "bufferConfig";

    private static final String PROP_BUFFER_CONFIG_MIN_BUFFER_MS = "minBufferMs";

    private static final String PROP_BUFFER_CONFIG_MAX_BUFFER_MS = "maxBufferMs";

    private static final String PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_MS = "bufferForPlaybackMs";

    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_SEEK = "seek";

    private static final String PROP_RATE = "rate";
@@ -214,6 +220,25 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi 
        videoView.setUseTextureView(useTextureView);

    }



    @ReactProp(name = PROP_BUFFER_CONFIG)

    public void setBufferConfig(final ReactExoplayerView videoView, @Nullable ReadableMap bufferConfig) {

        int minBufferMs = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS;

        int maxBufferMs = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS;

        int bufferForPlaybackMs = DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS;

        int bufferForPlaybackAfterRebufferMs = DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS;

        if (bufferConfig != null) {

            minBufferMs = bufferConfig.hasKey(PROP_BUFFER_CONFIG_MIN_BUFFER_MS)

                    ? bufferConfig.getInt(PROP_BUFFER_CONFIG_MIN_BUFFER_MS) : minBufferMs;

            maxBufferMs = bufferConfig.hasKey(PROP_BUFFER_CONFIG_MAX_BUFFER_MS)

                    ? bufferConfig.getInt(PROP_BUFFER_CONFIG_MAX_BUFFER_MS) : maxBufferMs;

            bufferForPlaybackMs = bufferConfig.hasKey(PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_MS)

                    ? bufferConfig.getInt(PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_MS) : bufferForPlaybackMs;

            bufferForPlaybackAfterRebufferMs = bufferConfig.hasKey(PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS)

                    ? bufferConfig.getInt(PROP_BUFFER_CONFIG_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS) : bufferForPlaybackAfterRebufferMs;

            videoView.setBufferConfig(minBufferMs, maxBufferMs, bufferForPlaybackMs, bufferForPlaybackAfterRebufferMs);

        }

    }



    private boolean startsWithValidScheme(String uriString) {

        return uriString.startsWith("http://")

                || uriString.startsWith("https://")