Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 1626b10

Browse files
[video_player] Update to ExoPlayer 2.14.1 (#4141)
Update the ExoPlayer dependency to the latest version, and remove the dependency on the deprecated Bintray server. This should resolve issues with building video_player due to 403s from bintray that have been breaking presubmits for all PRs.
1 parent 971d6c3 commit 1626b10

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

packages/video_player/video_player/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.1.7
2+
3+
* Update exoplayer to 2.14.1, removing dependency on Bintray.
4+
15
## 2.1.6
26

37
* Remove obsolete pre-1.0 warning from README.

packages/video_player/video_player/android/build.gradle

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ rootProject.allprojects {
1717
repositories {
1818
google()
1919
mavenCentral()
20-
// Gradle versions older than 2.13.3 aren't published to the servers
21-
// above, so add this URL as a workaround until upgrading past that
22-
// version.
23-
maven {
24-
url 'https://google.bintray.com/exoplayer/'
25-
}
2620
}
2721
}
2822

@@ -50,10 +44,10 @@ android {
5044
}
5145

5246
dependencies {
53-
implementation 'com.google.android.exoplayer:exoplayer-core:2.12.1'
54-
implementation 'com.google.android.exoplayer:exoplayer-hls:2.12.1'
55-
implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.1'
56-
implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.12.1'
47+
implementation 'com.google.android.exoplayer:exoplayer-core:2.14.1'
48+
implementation 'com.google.android.exoplayer:exoplayer-hls:2.14.1'
49+
implementation 'com.google.android.exoplayer:exoplayer-dash:2.14.1'
50+
implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.14.1'
5751
testImplementation 'junit:junit:4.12'
5852
testImplementation 'org.mockito:mockito-inline:3.9.0'
5953
}

packages/video_player/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import com.google.android.exoplayer2.MediaItem;
1717
import com.google.android.exoplayer2.PlaybackParameters;
1818
import com.google.android.exoplayer2.Player;
19-
import com.google.android.exoplayer2.Player.EventListener;
19+
import com.google.android.exoplayer2.Player.Listener;
2020
import com.google.android.exoplayer2.SimpleExoPlayer;
2121
import com.google.android.exoplayer2.audio.AudioAttributes;
2222
import com.google.android.exoplayer2.source.MediaSource;
@@ -29,7 +29,6 @@
2929
import com.google.android.exoplayer2.upstream.DataSource;
3030
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
3131
import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
32-
import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
3332
import com.google.android.exoplayer2.util.Util;
3433
import io.flutter.plugin.common.EventChannel;
3534
import io.flutter.view.TextureRegistry;
@@ -77,15 +76,13 @@ final class VideoPlayer {
7776

7877
DataSource.Factory dataSourceFactory;
7978
if (isHTTP(uri)) {
80-
DefaultHttpDataSourceFactory httpDataSourceFactory =
81-
new DefaultHttpDataSourceFactory(
82-
"ExoPlayer",
83-
null,
84-
DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
85-
DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
86-
true);
79+
DefaultHttpDataSource.Factory httpDataSourceFactory =
80+
new DefaultHttpDataSource.Factory()
81+
.setUserAgent("ExoPlayer")
82+
.setAllowCrossProtocolRedirects(true);
83+
8784
if (httpHeaders != null && !httpHeaders.isEmpty()) {
88-
httpDataSourceFactory.getDefaultRequestProperties().set(httpHeaders);
85+
httpDataSourceFactory.setDefaultRequestProperties(httpHeaders);
8986
}
9087
dataSourceFactory = httpDataSourceFactory;
9188
} else {
@@ -157,7 +154,6 @@ private MediaSource buildMediaSource(
157154

158155
private void setupVideoPlayer(
159156
EventChannel eventChannel, TextureRegistry.SurfaceTextureEntry textureEntry) {
160-
161157
eventChannel.setStreamHandler(
162158
new EventChannel.StreamHandler() {
163159
@Override
@@ -176,7 +172,7 @@ public void onCancel(Object o) {
176172
setAudioAttributes(exoPlayer, options.mixWithOthers);
177173

178174
exoPlayer.addListener(
179-
new EventListener() {
175+
new Listener() {
180176
private boolean isBuffering = false;
181177

182178
public void setBuffering(boolean buffering) {

packages/video_player/video_player/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Flutter plugin for displaying inline video with other Flutter
33
widgets on Android, iOS, and web.
44
repository: https://github.com/flutter/plugins/tree/master/packages/video_player/video_player
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
6-
version: 2.1.6
6+
version: 2.1.7
77

88
environment:
99
sdk: ">=2.12.0 <3.0.0"

0 commit comments

Comments
 (0)