[video_player] Update ExoPlayer to 2.18.0 (#6123)
diff --git a/packages/video_player/video_player_android/CHANGELOG.md b/packages/video_player/video_player_android/CHANGELOG.md
index 0c83996..fb34655 100644
--- a/packages/video_player/video_player_android/CHANGELOG.md
+++ b/packages/video_player/video_player_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.8
+
+* Updates ExoPlayer to 2.18.0.
+
## 2.3.7
* Bumps gradle version to 7.2.1.
diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle
index 8c1aaaf..e8032c5 100644
--- a/packages/video_player/video_player_android/android/build.gradle
+++ b/packages/video_player/video_player_android/android/build.gradle
@@ -43,10 +43,10 @@
}
dependencies {
- implementation 'com.google.android.exoplayer:exoplayer-core:2.17.1'
- implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1'
- implementation 'com.google.android.exoplayer:exoplayer-dash:2.17.1'
- implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.17.1'
+ implementation 'com.google.android.exoplayer:exoplayer-core:2.18.0'
+ implementation 'com.google.android.exoplayer:exoplayer-hls:2.18.0'
+ implementation 'com.google.android.exoplayer:exoplayer-dash:2.18.0'
+ implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.18.0'
testImplementation 'junit:junit:4.13.2'
testImplementation 'androidx.test:core:1.3.0'
testImplementation 'org.mockito:mockito-inline:3.9.0'
@@ -65,4 +65,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
index f215354..e130c99 100644
--- a/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
+++ b/packages/video_player/video_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
@@ -126,20 +126,20 @@
Uri uri, DataSource.Factory mediaDataSourceFactory, String formatHint, Context context) {
int type;
if (formatHint == null) {
- type = Util.inferContentType(uri.getLastPathSegment());
+ type = Util.inferContentType(uri);
} else {
switch (formatHint) {
case FORMAT_SS:
- type = C.TYPE_SS;
+ type = C.CONTENT_TYPE_SS;
break;
case FORMAT_DASH:
- type = C.TYPE_DASH;
+ type = C.CONTENT_TYPE_DASH;
break;
case FORMAT_HLS:
- type = C.TYPE_HLS;
+ type = C.CONTENT_TYPE_HLS;
break;
case FORMAT_OTHER:
- type = C.TYPE_OTHER;
+ type = C.CONTENT_TYPE_OTHER;
break;
default:
type = -1;
@@ -147,20 +147,20 @@
}
}
switch (type) {
- case C.TYPE_SS:
+ case C.CONTENT_TYPE_SS:
return new SsMediaSource.Factory(
new DefaultSsChunkSource.Factory(mediaDataSourceFactory),
new DefaultDataSource.Factory(context, mediaDataSourceFactory))
.createMediaSource(MediaItem.fromUri(uri));
- case C.TYPE_DASH:
+ case C.CONTENT_TYPE_DASH:
return new DashMediaSource.Factory(
new DefaultDashChunkSource.Factory(mediaDataSourceFactory),
new DefaultDataSource.Factory(context, mediaDataSourceFactory))
.createMediaSource(MediaItem.fromUri(uri));
- case C.TYPE_HLS:
+ case C.CONTENT_TYPE_HLS:
return new HlsMediaSource.Factory(mediaDataSourceFactory)
.createMediaSource(MediaItem.fromUri(uri));
- case C.TYPE_OTHER:
+ case C.CONTENT_TYPE_OTHER:
return new ProgressiveMediaSource.Factory(mediaDataSourceFactory)
.createMediaSource(MediaItem.fromUri(uri));
default:
@@ -246,7 +246,8 @@
private static void setAudioAttributes(ExoPlayer exoPlayer, boolean isMixMode) {
exoPlayer.setAudioAttributes(
- new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build(), !isMixMode);
+ new AudioAttributes.Builder().setContentType(C.AUDIO_CONTENT_TYPE_MOVIE).build(),
+ !isMixMode);
}
void play() {
diff --git a/packages/video_player/video_player_android/pubspec.yaml b/packages/video_player/video_player_android/pubspec.yaml
index f11a74e..056221a 100644
--- a/packages/video_player/video_player_android/pubspec.yaml
+++ b/packages/video_player/video_player_android/pubspec.yaml
@@ -2,7 +2,7 @@
description: Android implementation of the video_player plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/video_player/video_player_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
-version: 2.3.7
+version: 2.3.8
environment:
sdk: ">=2.14.0 <3.0.0"
