From fd94ef9fa7cc1d46f3f5de064e981a7ac80fb011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patric=20Karlstr=C3=B6m?= <patric@pkcab.eu>
Date: Mon, 11 Jan 2021 01:10:23 +0100
Subject: [PATCH] Upgrade ExoPlayer from 2.11.4 to 2.12.2

---
 app/build.gradle                                   | 10 +++++-----
 app/src/main/AndroidManifest.xml                   |  1 +
 .../browser/ui/findcontent/FileViewFragment.java   |  2 ++
 .../browser/ui/findcontent/ShuffleFragment.java    |  1 +
 .../lbry/browser/utils/ExoplayerAudioRenderer.java | 14 +++++++-------
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3fca2fe..90f3e481 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,11 +104,11 @@ dependencies {
     implementation 'com.android.billingclient:billing:3.0.2'
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.11.4'
-    implementation 'com.google.android.exoplayer:exoplayer-dash:2.11.4'
-    implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.4'
-    implementation 'com.google.android.exoplayer:extension-cast:2.11.4'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.11.4'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.12.2'
+    implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.2'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.2'
+    implementation 'com.google.android.exoplayer:extension-cast:2.12.2'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
 
     implementation 'com.google.android:flexbox:2.0.1'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cc655ddf..d5aacbb8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
index a586e748..f7410008 100644
--- a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java
@@ -1676,6 +1676,8 @@ public class FileViewFragment extends BaseFragment implements
                     .build();
 
             MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
+            MainActivity.appPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
+
             MainActivity.appPlayer.setAudioAttributes(audioAttributes, true);
             MainActivity.playerCache =
                     new SimpleCache(context.getCacheDir(),
diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java
index 27ce3766..efce66c8 100644
--- a/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java
+++ b/app/src/main/java/io/lbry/browser/ui/findcontent/ShuffleFragment.java
@@ -448,6 +448,7 @@ public class ShuffleFragment extends BaseFragment {
                     .build();
 
             MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
+            MainActivity.appPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
             MainActivity.appPlayer.setAudioAttributes(audioAttributes, true);
             MainActivity.playerCache =
                     new SimpleCache(context.getCacheDir(),
diff --git a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java
index 832db7f2..80cb4488 100644
--- a/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java
+++ b/app/src/main/java/io/lbry/browser/utils/ExoplayerAudioRenderer.java
@@ -6,9 +6,13 @@ import android.os.Handler;
 import androidx.annotation.Nullable;
 
 import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.audio.AudioSink;
+import com.google.android.exoplayer2.audio.DefaultAudioSink;
 import com.google.android.exoplayer2.audio.TeeAudioProcessor;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -30,22 +34,18 @@ public class ExoplayerAudioRenderer extends DefaultRenderersFactory {
             Context context,
             int extensionRendererMode,
             MediaCodecSelector mediaCodecSelector,
-            @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-            boolean playClearSamplesWithoutKeys,
             boolean enableDecoderFallback,
-            AudioProcessor[] audioProcessors,
+            AudioSink audioSink,
             Handler eventHandler,
             AudioRendererEventListener eventListener,
             ArrayList<Renderer> out) {
-        AudioProcessor[] audioProcessorList = { new TeeAudioProcessor(audioBufferSink) };
+
         super.buildAudioRenderers(
                 context,
                 extensionRendererMode,
                 mediaCodecSelector,
-                drmSessionManager,
-                playClearSamplesWithoutKeys,
                 enableDecoderFallback,
-                audioProcessorList,
+                audioSink,
                 eventHandler,
                 eventListener,
                 out);