diff --git a/README.md b/README.md index 09f0aa6..ea17973 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=16) -This library uses OpenGL Shaders to apply effects on [ExoPlayer](https://github.com/google/ExoPlayer) video at Runtime and
depends EXOPlayer core 2.14.0.
+This library uses OpenGL Shaders to apply effects on [ExoPlayer](https://github.com/google/ExoPlayer) video at Runtime and
depends EXOPlayer core 2.18.0.
## Gradle @@ -20,10 +20,10 @@ Step 2. Add the dependency ```groovy dependencies { implementation 'com.github.MasayukiSuda:ExoPlayerFilter:v0.2.6' - implementation 'com.google.android.exoplayer:exoplayer-core:2.14.0' + implementation 'com.google.android.exoplayer:exoplayer-core:2.18.0' } ``` -This library depends ExoPlayer core 2.14.0 +This library depends ExoPlayer core 2.18.0 ## Sample Usage diff --git a/epf/build.gradle b/epf/build.gradle index 3a5649f..3cd131a 100644 --- a/epf/build.gradle +++ b/epf/build.gradle @@ -27,5 +27,5 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.6.1' - compileOnly 'com.google.android.exoplayer:exoplayer-core:2.14.0' + compileOnly 'com.google.android.exoplayer:exoplayer-core:2.18.0' } diff --git a/epf/src/main/java/com/daasuu/epf/EPlayerView.java b/epf/src/main/java/com/daasuu/epf/EPlayerView.java index ef88354..d66096e 100644 --- a/epf/src/main/java/com/daasuu/epf/EPlayerView.java +++ b/epf/src/main/java/com/daasuu/epf/EPlayerView.java @@ -7,13 +7,14 @@ import com.daasuu.epf.chooser.EConfigChooser; import com.daasuu.epf.contextfactory.EContextFactory; import com.daasuu.epf.filter.GlFilter; +import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.video.VideoListener; +import com.google.android.exoplayer2.video.VideoSize; /** * Created by sudamasayuki on 2017/05/16. */ -public class EPlayerView extends GLSurfaceView implements VideoListener { +public class EPlayerView extends GLSurfaceView implements Player.Listener { private final static String TAG = EPlayerView.class.getSimpleName(); @@ -44,7 +45,7 @@ public EPlayerView setSimpleExoPlayer(SimpleExoPlayer player) { this.player = null; } this.player = player; - this.player.addVideoListener(this); + this.player.addListener(this); this.renderer.setSimpleExoPlayer(player); return this; } @@ -90,10 +91,15 @@ public void onPause() { } ////////////////////////////////////////////////////////////////////////// - // SimpleExoPlayer.VideoListener + // Player.Listener @Override - public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) { + public void onVideoSizeChanged(VideoSize videoSize) { + int width = videoSize.width; + int height = videoSize.height; + float pixelWidthHeightRatio = videoSize.pixelWidthHeightRatio; + int unappliedRotationDegrees = videoSize.unappliedRotationDegrees; + // Log.d(TAG, "width = " + width + " height = " + height + " unappliedRotationDegrees = " + unappliedRotationDegrees + " pixelWidthHeightRatio = " + pixelWidthHeightRatio); videoAspect = ((float) width / height) * pixelWidthHeightRatio; // Log.d(TAG, "videoAspect = " + videoAspect); diff --git a/sample/build.gradle b/sample/build.gradle index 4a1bdf5..145d984 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -30,5 +30,5 @@ dependencies { implementation project(':epf') - implementation 'com.google.android.exoplayer:exoplayer-core:2.14.0' + implementation 'com.google.android.exoplayer:exoplayer-core:2.18.0' }