Skip to content

Commit e51dbed

Browse files
TacoTheDankTacoTheDank
committed
Update ExoPlayer to 2.18.0
1 parent a59660f commit e51dbed

File tree

5 files changed

+48
-50
lines changed

5 files changed

+48
-50
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ext {
105105
androidxWorkVersion = '2.7.1'
106106

107107
icepickVersion = '3.2.0'
108-
exoPlayerVersion = '2.17.1'
108+
exoPlayerVersion = '2.18.0'
109109
googleAutoServiceVersion = '1.0.1'
110110
groupieVersion = '2.10.1'
111111
markwonVersion = '4.6.2'

‎app/src/main/java/org/schabi/newpipe/player/Player.java‎

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
import androidx.appcompat.view.ContextThemeWrapper;
117117
import androidx.appcompat.widget.AppCompatImageButton;
118118
import androidx.appcompat.widget.PopupMenu;
119-
import androidx.collection.ArraySet;
120119
import androidx.core.content.ContextCompat;
121120
import androidx.core.graphics.Insets;
122121
import androidx.core.view.ViewCompat;
@@ -135,9 +134,9 @@
135134
import com.google.android.exoplayer2.Player.PositionInfo;
136135
import com.google.android.exoplayer2.RenderersFactory;
137136
import com.google.android.exoplayer2.Timeline;
138-
import com.google.android.exoplayer2.TracksInfo;
137+
import com.google.android.exoplayer2.Tracks;
139138
import com.google.android.exoplayer2.source.MediaSource;
140-
import com.google.android.exoplayer2.text.Cue;
139+
import com.google.android.exoplayer2.text.CueGroup;
141140
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
142141
import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
143142
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
@@ -2522,12 +2521,12 @@ public void onEvents(@NonNull final com.google.android.exoplayer2.Player player,
25222521
}
25232522

25242523
@Override
2525-
public void onTracksInfoChanged(@NonNull final TracksInfo tracksInfo) {
2524+
public void onTracksChanged(@NonNull final Tracks tracks) {
25262525
if (DEBUG) {
25272526
Log.d(TAG, "ExoPlayer - onTracksChanged(), "
2528-
+ "track group size = " + tracksInfo.getTrackGroupInfos().size());
2527+
+ "track group size = " + tracks.getGroups().size());
25292528
}
2530-
onTextTracksChanged(tracksInfo);
2529+
onTextTracksChanged(tracks);
25312530
}
25322531

25332532
@Override
@@ -2593,8 +2592,8 @@ public void onRenderedFirstFrame() {
25932592
}
25942593

25952594
@Override
2596-
public void onCues(@NonNull final List<Cue> cues) {
2597-
binding.subtitleView.onCues(cues);
2595+
public void onCues(@NonNull final CueGroup cueGroup) {
2596+
binding.subtitleView.setCues(cueGroup.cues);
25982597
}
25992598
//endregion
26002599

@@ -3679,34 +3678,35 @@ private void setupSubtitleView() {
36793678
binding.subtitleView.setStyle(captionStyle);
36803679
}
36813680

3682-
private void onTextTracksChanged(@NonNull final TracksInfo currentTrackInfo) {
3681+
private void onTextTracksChanged(@NonNull final Tracks currentTrack) {
36833682
if (binding == null) {
36843683
return;
36853684
}
36863685

3687-
if (trackSelector.getCurrentMappedTrackInfo() == null
3688-
|| !currentTrackInfo.isTypeSupportedOrEmpty(C.TRACK_TYPE_TEXT)) {
3686+
final boolean trackTypeTextSupported = !currentTrack.containsType(C.TRACK_TYPE_TEXT)
3687+
|| currentTrack.isTypeSupported(C.TRACK_TYPE_TEXT, false);
3688+
if (trackSelector.getCurrentMappedTrackInfo() == null || !trackTypeTextSupported) {
36893689
binding.captionTextView.setVisibility(View.GONE);
36903690
return;
36913691
}
36923692

36933693
// Extract all loaded languages
3694-
final List<TracksInfo.TrackGroupInfo> textTracks = currentTrackInfo
3695-
.getTrackGroupInfos()
3694+
final List<Tracks.Group> textTracks = currentTrack
3695+
.getGroups()
36963696
.stream()
3697-
.filter(trackGroupInfo -> C.TRACK_TYPE_TEXT == trackGroupInfo.getTrackType())
3697+
.filter(trackGroupInfo -> C.TRACK_TYPE_TEXT == trackGroupInfo.getType())
36983698
.collect(Collectors.toList());
36993699
final List<String> availableLanguages = textTracks.stream()
3700-
.map(TracksInfo.TrackGroupInfo::getTrackGroup)
3700+
.map(Tracks.Group::getMediaTrackGroup)
37013701
.filter(textTrack -> textTrack.length > 0)
37023702
.map(textTrack -> textTrack.getFormat(0).language)
37033703
.collect(Collectors.toList());
37043704

37053705
// Find selected text track
37063706
final Optional<Format> selectedTracks = textTracks.stream()
3707-
.filter(TracksInfo.TrackGroupInfo::isSelected)
3708-
.filter(info -> info.getTrackGroup().length >= 1)
3709-
.map(info -> info.getTrackGroup().getFormat(0))
3707+
.filter(Tracks.Group::isSelected)
3708+
.filter(info -> info.getMediaTrackGroup().length >= 1)
3709+
.map(info -> info.getMediaTrackGroup().getFormat(0))
37103710
.findFirst();
37113711

37123712
// Build UI
@@ -4256,20 +4256,12 @@ private void useVideoSource(final boolean videoEnabled) {
42564256
return;
42574257
}
42584258

4259-
final DefaultTrackSelector.ParametersBuilder parametersBuilder =
4259+
final DefaultTrackSelector.Parameters.Builder parametersBuilder =
42604260
trackSelector.buildUponParameters();
42614261

4262-
if (videoEnabled) {
4263-
// Enable again the video track and the subtitles, if there is one selected
4264-
parametersBuilder.setDisabledTrackTypes(Collections.emptySet());
4265-
} else {
4266-
// Disable the video track and the ability to select subtitles
4267-
// Use an ArraySet because we can't use Set.of() on all supported APIs by the app
4268-
final ArraySet<Integer> disabledTracks = new ArraySet<>();
4269-
disabledTracks.add(C.TRACK_TYPE_TEXT);
4270-
disabledTracks.add(C.TRACK_TYPE_VIDEO);
4271-
parametersBuilder.setDisabledTrackTypes(disabledTracks);
4272-
}
4262+
// Enable/disable the video track and the ability to select subtitles
4263+
parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_TEXT, !videoEnabled);
4264+
parametersBuilder.setTrackTypeDisabled(C.TRACK_TYPE_VIDEO, !videoEnabled);
42734265

42744266
trackSelector.setParameters(parametersBuilder);
42754267
}

‎app/src/main/java/org/schabi/newpipe/player/mediaitem/MediaItemTag.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.net.Uri;
44

55
import com.google.android.exoplayer2.MediaItem;
6+
import com.google.android.exoplayer2.MediaItem.RequestMetadata;
67
import com.google.android.exoplayer2.MediaMetadata;
78
import com.google.android.exoplayer2.Player;
89

@@ -76,18 +77,22 @@ default String makeMediaId() {
7677
@NonNull
7778
default MediaItem asMediaItem() {
7879
final MediaMetadata mediaMetadata = new MediaMetadata.Builder()
79-
.setMediaUri(Uri.parse(getStreamUrl()))
8080
.setArtworkUri(Uri.parse(getThumbnailUrl()))
8181
.setArtist(getUploaderName())
8282
.setDescription(getTitle())
8383
.setDisplayTitle(getTitle())
8484
.setTitle(getTitle())
8585
.build();
8686

87+
final RequestMetadata requestMetaData = new RequestMetadata.Builder()
88+
.setMediaUri(Uri.parse(getStreamUrl()))
89+
.build();
90+
8791
return MediaItem.fromUri(getStreamUrl())
8892
.buildUpon()
8993
.setMediaId(makeMediaId())
9094
.setMediaMetadata(mediaMetadata)
95+
.setRequestMetadata(requestMetaData)
9196
.setTag(this)
9297
.build();
9398
}

‎app/src/main/java/org/schabi/newpipe/player/playback/SurfaceHolderCallback.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.view.SurfaceHolder;
55

66
import com.google.android.exoplayer2.Player;
7-
import com.google.android.exoplayer2.video.DummySurface;
7+
import com.google.android.exoplayer2.video.PlaceholderSurface;
88

99
/**
1010
* Prevent error message: 'Unrecoverable player error occurred'
@@ -26,7 +26,7 @@ public final class SurfaceHolderCallback implements SurfaceHolder.Callback {
2626

2727
private final Context context;
2828
private final Player player;
29-
private DummySurface dummySurface;
29+
private PlaceholderSurface placeholderSurface;
3030

3131
public SurfaceHolderCallback(final Context context, final Player player) {
3232
this.context = context;
@@ -47,16 +47,16 @@ public void surfaceChanged(final SurfaceHolder holder,
4747

4848
@Override
4949
public void surfaceDestroyed(final SurfaceHolder holder) {
50-
if (dummySurface == null) {
51-
dummySurface = DummySurface.newInstanceV17(context, false);
50+
if (placeholderSurface == null) {
51+
placeholderSurface = PlaceholderSurface.newInstanceV17(context, false);
5252
}
53-
player.setVideoSurface(dummySurface);
53+
player.setVideoSurface(placeholderSurface);
5454
}
5555

5656
public void release() {
57-
if (dummySurface != null) {
58-
dummySurface.release();
59-
dummySurface = null;
57+
if (placeholderSurface != null) {
58+
placeholderSurface.release();
59+
placeholderSurface = null;
6060
}
6161
}
6262
}

‎app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ default MediaSource maybeBuildLiveMediaSource(@NonNull final PlayerDataSource da
3232

3333
final StreamInfoTag tag = StreamInfoTag.of(info);
3434
if (!info.getHlsUrl().isEmpty()) {
35-
return buildLiveMediaSource(dataSource, info.getHlsUrl(), C.TYPE_HLS, tag);
35+
return buildLiveMediaSource(dataSource, info.getHlsUrl(), C.CONTENT_TYPE_HLS, tag);
3636
} else if (!info.getDashMpdUrl().isEmpty()) {
37-
return buildLiveMediaSource(dataSource, info.getDashMpdUrl(), C.TYPE_DASH, tag);
37+
return buildLiveMediaSource(dataSource, info.getDashMpdUrl(), C.CONTENT_TYPE_DASH, tag);
3838
}
3939

4040
return null;
@@ -47,13 +47,13 @@ default MediaSource buildLiveMediaSource(@NonNull final PlayerDataSource dataSou
4747
@NonNull final MediaItemTag metadata) {
4848
final MediaSource.Factory factory;
4949
switch (type) {
50-
case C.TYPE_SS:
50+
case C.CONTENT_TYPE_SS:
5151
factory = dataSource.getLiveSsMediaSourceFactory();
5252
break;
53-
case C.TYPE_DASH:
53+
case C.CONTENT_TYPE_DASH:
5454
factory = dataSource.getLiveDashMediaSourceFactory();
5555
break;
56-
case C.TYPE_HLS:
56+
case C.CONTENT_TYPE_HLS:
5757
factory = dataSource.getLiveHlsMediaSourceFactory();
5858
break;
5959
default:
@@ -81,20 +81,21 @@ default MediaSource buildMediaSource(@NonNull final PlayerDataSource dataSource,
8181
@NonNull final MediaItemTag metadata) {
8282
final Uri uri = Uri.parse(sourceUrl);
8383
@C.ContentType final int type = TextUtils.isEmpty(overrideExtension)
84-
? Util.inferContentType(uri) : Util.inferContentType("." + overrideExtension);
84+
? Util.inferContentType(uri)
85+
: Util.inferContentTypeForExtension("." + overrideExtension);
8586

8687
final MediaSource.Factory factory;
8788
switch (type) {
88-
case C.TYPE_SS:
89+
case C.CONTENT_TYPE_SS:
8990
factory = dataSource.getLiveSsMediaSourceFactory();
9091
break;
91-
case C.TYPE_DASH:
92+
case C.CONTENT_TYPE_DASH:
9293
factory = dataSource.getDashMediaSourceFactory();
9394
break;
94-
case C.TYPE_HLS:
95+
case C.CONTENT_TYPE_HLS:
9596
factory = dataSource.getHlsMediaSourceFactory();
9697
break;
97-
case C.TYPE_OTHER:
98+
case C.CONTENT_TYPE_OTHER:
9899
factory = dataSource.getExtractorMediaSourceFactory();
99100
break;
100101
default:

0 commit comments

Comments
 (0)