be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3752 from Redirion/exoupdate 

Update to ExoPlayer 2.11.6
This commit is contained in:
Tobias Groza 2020-06-26 18:33:53 +02:00 committed by GitHub
parent 5cfd8bbb56 0a57a8a7f3
commit fe4516ea23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -84,7 +84,7 @@ ext {
checkstyleVersion = '8.32' checkstyleVersion = '8.32'
stethoVersion = '1.5.1' stethoVersion = '1.5.1'
leakCanaryVersion = '2.2' leakCanaryVersion = '2.2'
exoPlayerVersion = '2.11.4' exoPlayerVersion = '2.11.6'
androidxLifecycleVersion = '2.2.0' androidxLifecycleVersion = '2.2.0'
androidxRoomVersion = '2.2.5' androidxRoomVersion = '2.2.5'
groupieVersion = '2.8.0' groupieVersion = '2.8.0'

2
app/src/main/java/org/schabi/newpipe/player/BasePlayer.java
View File

@ -215,7 +215,7 @@ public abstract class BasePlayer implements
final TrackSelection.Factory trackSelectionFactory = PlayerHelper final TrackSelection.Factory trackSelectionFactory = PlayerHelper
.getQualitySelector(context); .getQualitySelector(context);
this.trackSelector = new CustomTrackSelector(trackSelectionFactory); this.trackSelector = new CustomTrackSelector(context, trackSelectionFactory);
this.loadControl = new LoadController(); this.loadControl = new LoadController();
this.renderFactory = new DefaultRenderersFactory(context); this.renderFactory = new DefaultRenderersFactory(context);

6
app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
View File

@ -1,5 +1,6 @@
package org.schabi.newpipe.player.playback; package org.schabi.newpipe.player.playback;
import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Pair; import android.util.Pair;
@ -26,8 +27,9 @@ import com.google.android.exoplayer2.util.Assertions;
public class CustomTrackSelector extends DefaultTrackSelector { public class CustomTrackSelector extends DefaultTrackSelector {
private String preferredTextLanguage; private String preferredTextLanguage;
public CustomTrackSelector(final TrackSelection.Factory adaptiveTrackSelectionFactory) { public CustomTrackSelector(final Context context,
super(adaptiveTrackSelectionFactory); final TrackSelection.Factory adaptiveTrackSelectionFactory) {
super(context, adaptiveTrackSelectionFactory);
} }
private static boolean formatHasLanguage(final Format format, final String language) { private static boolean formatHasLanguage(final Format format, final String language) {