Unverified Commit 0fb2a546 authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #983 from peacechen/master 

Upgrade ExoPlayer to 2.7.2
parents 3bea9667 785cac6f

android-exoplayer/build.gradle

+3 −3
Changes for android-exoplayer/build.gradle: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ android { 


dependencies {

    provided 'com.facebook.react:react-native:+'

    compile 'com.google.android.exoplayer:exoplayer:r2.4.0'

    compile('com.google.android.exoplayer:extension-okhttp:r2.4.0') {

    compile 'com.google.android.exoplayer:exoplayer:2.7.3'

    compile('com.google.android.exoplayer:extension-okhttp:2.7.3') {

        exclude group: 'com.squareup.okhttp3', module: 'okhttp'

    }

    compile 'com.squareup.okhttp3:okhttp:3.4.2'

    compile 'com.squareup.okhttp3:okhttp:3.9.1'

}

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

+18 −2
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java: 18 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray; 
import com.google.android.exoplayer2.ui.SubtitleView;



import java.util.List;

import java.lang.Object;



@TargetApi(16)

public final class ExoPlayerView extends FrameLayout {
@@ -212,12 +213,12 @@ public final class ExoPlayerView extends FrameLayout { 
        }



        @Override

        public void onPositionDiscontinuity() {

        public void onPositionDiscontinuity(int reason) {

            // Do nothing.

        }



        @Override

        public void onTimelineChanged(Timeline timeline, Object manifest) {

        public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {

            // Do nothing.

        }
@@ -235,6 +236,21 @@ public final class ExoPlayerView extends FrameLayout { 
        public void onMetadata(Metadata metadata) {

            Log.d("onMetadata", "onMetadata");

        }



        @Override

        public void onSeekProcessed() {

            // Do nothing.

        }



        @Override

        public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {

            // Do nothing.

        }



        @Override

        public void onRepeatModeChanged(int repeatMode) {

            // Do nothing.

        }

    }



}

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
@@ -55,6 +55,7 @@ import java.net.CookieHandler; 
import java.net.CookieManager;

import java.net.CookiePolicy;

import java.lang.Math;

import java.lang.Object;



@SuppressLint("ViewConstructor")

class ReactExoplayerView extends FrameLayout implements
@@ -463,7 +464,7 @@ class ReactExoplayerView extends FrameLayout implements 
    }



    @Override

    public void onPositionDiscontinuity() {

    public void onPositionDiscontinuity(int reason) {

        if (playerNeedsSource) {

            // This will only occur if the user has performed a seek whilst in the error state. Update the

            // resume position so that if the user then retries, playback will resume from the position to
@@ -473,7 +474,22 @@ class ReactExoplayerView extends FrameLayout implements 
    }



    @Override

    public void onTimelineChanged(Timeline timeline, Object manifest) {

    public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {

        // Do nothing.

    }



    @Override

    public void onSeekProcessed() {

        // Do nothing.

    }



    @Override

    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {

        // Do nothing.

    }



    @Override

    public void onRepeatModeChanged(int repeatMode) {

        // Do nothing.

    }