From 6598e176c735d63dff3cf91fe1a236beaeca3018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20Cotta?= Date: Wed, 17 Jul 2019 01:12:48 -0300 Subject: [PATCH 1/2] - updated ExoPlayer Android to version 2.10.3 - updated changelog and pubspec --- packages/video_player/CHANGELOG.md | 4 +++ packages/video_player/android/build.gradle | 9 ++++--- .../videoplayer/VideoPlayerPlugin.java | 27 ++++++------------- packages/video_player/pubspec.yaml | 2 +- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/packages/video_player/CHANGELOG.md b/packages/video_player/CHANGELOG.md index 46f766ace4e1..1092c3fb91b9 100644 --- a/packages/video_player/CHANGELOG.md +++ b/packages/video_player/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.10.1+5 + +* Updated ExoPlayer to version 2.10.3 + ## 0.10.1+4 * Fixed syntax error in README.md. diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle index ec60461e1900..a2eed915fdfd 100644 --- a/packages/video_player/android/build.gradle +++ b/packages/video_player/android/build.gradle @@ -51,10 +51,11 @@ android { } } + def exoPlayerVersion = '2.10.3' dependencies { - implementation 'com.google.android.exoplayer:exoplayer-core:2.9.6' - implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.6' - implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.6' - implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.6' + implementation "com.google.android.exoplayer:exoplayer-core:$exoPlayerVersion" + implementation "com.google.android.exoplayer:exoplayer-hls:$exoPlayerVersion" + implementation "com.google.android.exoplayer:exoplayer-dash:$exoPlayerVersion" + implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoPlayerVersion" } } diff --git a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java index 0be5e770101c..9c388f951d09 100644 --- a/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java +++ b/packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java @@ -9,7 +9,6 @@ import android.content.Context; import android.net.Uri; -import android.os.Build; import android.util.LongSparseArray; import android.view.Surface; import com.google.android.exoplayer2.C; @@ -21,8 +20,8 @@ import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.audio.AudioAttributes; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; -import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.source.dash.DashMediaSource; import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource; import com.google.android.exoplayer2.source.hls.HlsMediaSource; @@ -40,9 +39,7 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry; import io.flutter.plugin.common.PluginRegistry.Registrar; -import io.flutter.view.FlutterNativeView; import io.flutter.view.TextureRegistry; import java.util.Arrays; import java.util.Collections; @@ -124,8 +121,8 @@ private MediaSource buildMediaSource( case C.TYPE_HLS: return new HlsMediaSource.Factory(mediaDataSourceFactory).createMediaSource(uri); case C.TYPE_OTHER: - return new ExtractorMediaSource.Factory(mediaDataSourceFactory) - .setExtractorsFactory(new DefaultExtractorsFactory()) + return new ProgressiveMediaSource.Factory( + mediaDataSourceFactory, new DefaultExtractorsFactory()) .createMediaSource(uri); default: { @@ -197,14 +194,9 @@ private void sendBufferingUpdate() { eventSink.success(event); } - @SuppressWarnings("deprecation") private static void setAudioAttributes(SimpleExoPlayer exoPlayer) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - exoPlayer.setAudioAttributes( - new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build()); - } else { - exoPlayer.setAudioStreamType(C.STREAM_TYPE_MUSIC); - } + exoPlayer.setAudioAttributes( + new AudioAttributes.Builder().setContentType(C.CONTENT_TYPE_MOVIE).build()); } void play() { @@ -277,12 +269,9 @@ public static void registerWith(Registrar registrar) { new MethodChannel(registrar.messenger(), "flutter.io/videoPlayer"); channel.setMethodCallHandler(plugin); registrar.addViewDestroyListener( - new PluginRegistry.ViewDestroyListener() { - @Override - public boolean onViewDestroy(FlutterNativeView view) { - plugin.onDestroy(); - return false; // We are not interested in assuming ownership of the NativeView. - } + view -> { + plugin.onDestroy(); + return false; // We are not interested in assuming ownership of the NativeView. }); } diff --git a/packages/video_player/pubspec.yaml b/packages/video_player/pubspec.yaml index dd5d0b5a75f5..bbb2dcda02ef 100644 --- a/packages/video_player/pubspec.yaml +++ b/packages/video_player/pubspec.yaml @@ -2,7 +2,7 @@ name: video_player description: Flutter plugin for displaying inline video with other Flutter widgets on Android and iOS. author: Flutter Team -version: 0.10.1+4 +version: 0.10.1+5 homepage: https://github.com/flutter/plugins/tree/master/packages/video_player flutter: From f67c45b8a081e0232867b2cbb44a7f4f0e13a2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20Cotta?= Date: Thu, 10 Oct 2019 13:49:26 -0300 Subject: [PATCH 2/2] updated exoplayer to 2.10.5 --- packages/video_player/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/video_player/android/build.gradle b/packages/video_player/android/build.gradle index a2eed915fdfd..a06007672886 100644 --- a/packages/video_player/android/build.gradle +++ b/packages/video_player/android/build.gradle @@ -51,7 +51,7 @@ android { } } - def exoPlayerVersion = '2.10.3' + def exoPlayerVersion = '2.10.5' dependencies { implementation "com.google.android.exoplayer:exoplayer-core:$exoPlayerVersion" implementation "com.google.android.exoplayer:exoplayer-hls:$exoPlayerVersion"