Update to ExoPlayer 2.4.0k1

Fixes #149
kiall · Apr 29, 2017 · 491e4bc · 491e4bc
1 parent 7ccb8a4
commit 491e4bc
Show file tree

Hide file tree

Showing 6 changed files with 272 additions and 156 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -77,8 +77,9 @@ dependencies {
     compile 'com.android.support:support-v4:25.3.1'
     compile 'com.android.support:leanback-v17:25.3.1'
     compile 'com.android.support:preference-leanback-v17:25.3.1'
-    compile 'com.google.android.exoplayer:exoplayer:r2.3.0k1'
-    compile 'com.google.android.exoplayer:extension-ffmpeg:r2.3.0k1'
+    compile 'com.google.android.exoplayer:exoplayer-core:r2.4.0k1'
+    compile 'com.google.android.exoplayer:exoplayer-ui:r2.4.0k1'
+    compile 'com.google.android.exoplayer:extension-ffmpeg:r2.4.0k1'
     // Used for testing local exoplayer builds
 //    compile(name: 'library-debug', ext: 'aar')
     // Used for testing local exoplayer-ffmpeg builds

diff --git a/app/src/main/java/ie/macinnes/tvheadend/player/EventLogger.java b/app/src/main/java/ie/macinnes/tvheadend/player/EventLogger.java
@@ -23,6 +23,7 @@
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
@@ -102,6 +103,12 @@ public void onPositionDiscontinuity() {
     Log.d(TAG, "positionDiscontinuity");
   }
 
+  @Override
+  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+    Log.d(TAG, "playbackParameters " + String.format(
+            "[speed=%.2f, pitch=%.2f]", playbackParameters.speed, playbackParameters.pitch));
+  }
+
   @Override
   public void onTimelineChanged(Timeline timeline, Object manifest) {
     if (timeline == null) {

diff --git a/app/src/main/java/ie/macinnes/tvheadend/player/Player.java b/app/src/main/java/ie/macinnes/tvheadend/player/Player.java
@@ -31,12 +31,15 @@
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.extractor.ExtractorsFactory;
@@ -202,12 +205,10 @@ private void buildExoPlayer() {
 
         LoadControl loadControl = buildLoadControl();
 
-        int extensionRendererMode = SimpleExoPlayer.EXTENSION_RENDERER_MODE_PREFER;
-
-        mExoPlayer = new SimpleTvheadendPlayer(
-                mContext, mTrackSelector, loadControl, null, extensionRendererMode,
-                ExoPlayerFactory.DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS);
+        RenderersFactory renderersFactory = new TvheadendRenderersFactory(
+                mContext, null, DefaultRenderersFactory.DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS);
 
+        mExoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, mTrackSelector, loadControl);
         mExoPlayer.addListener(this);
 
         // Add the EventLogger
@@ -345,4 +346,9 @@ public void onPlayerError(ExoPlaybackException error) {
     public void onPositionDiscontinuity() {
 
     }
+
+    @Override
+    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+
+    }
 }
diff --git a/app/src/main/java/ie/macinnes/tvheadend/player/SimpleTvheadendPlayer.java b/app/src/main/java/ie/macinnes/tvheadend/player/SimpleTvheadendPlayer.java