diff --git a/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java b/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java
index 667de326..22347e82 100644
--- a/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java
+++ b/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java
@@ -17,7 +17,6 @@
import com.google.android.exoplayer2.RenderersFactory;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.analytics.AnalyticsCollector;
-import com.google.android.exoplayer2.source.DefaultMediaSourceEventListener;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSourceEventListener;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -135,10 +134,9 @@ public void prepareAsync() {
mInternalPlayer.prepare(mMediaSource);
}
- private MediaSourceEventListener mMediaSourceEventListener = new DefaultMediaSourceEventListener() {
+ private MediaSourceEventListener mMediaSourceEventListener = new MediaSourceEventListener() {
@Override
public void onReadingStarted(int windowIndex, MediaSource.MediaPeriodId mediaPeriodId) {
- super.onReadingStarted(windowIndex, mediaPeriodId);
if (mPlayerEventListener != null && mIsPreparing) {
mPlayerEventListener.onPrepared();
}
diff --git a/dkplayer-players/thunder/.gitignore b/dkplayer-players/thunder/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/dkplayer-players/thunder/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/dkplayer-players/thunder/build.gradle b/dkplayer-players/thunder/build.gradle
deleted file mode 100644
index 2dddf922..00000000
--- a/dkplayer-players/thunder/build.gradle
+++ /dev/null
@@ -1,32 +0,0 @@
-apply plugin: 'com.android.library'
-apply from: '../../constants.gradle'
-
-android {
- compileSdkVersion project.ext.compileSdkVersion
- buildToolsVersion project.ext.buildToolsVersion
-
- defaultConfig {
- minSdkVersion project.ext.minSdkVersion
- targetSdkVersion project.ext.targetSdkVersion
- }
-
-
-}
-
-repositories {
- flatDir {
- dirs 'libs'
- }
-}
-
-dependencies {
- implementation fileTree(include: ['*.jar'], dir: 'libs')
- compileOnly project(':dkplayer-java')
- api(name: 'APlayerAndroid', ext: 'aar')
-}
-
-//ext {
-// releaseArtifact = 'player-thunder'
-//}
-
-//apply from: '../../publish.gradle'
\ No newline at end of file
diff --git a/dkplayer-players/thunder/libs/APlayerAndroid.aar b/dkplayer-players/thunder/libs/APlayerAndroid.aar
deleted file mode 100644
index 855df99f..00000000
Binary files a/dkplayer-players/thunder/libs/APlayerAndroid.aar and /dev/null differ
diff --git a/dkplayer-players/thunder/src/main/AndroidManifest.xml b/dkplayer-players/thunder/src/main/AndroidManifest.xml
deleted file mode 100644
index 9738e020..00000000
--- a/dkplayer-players/thunder/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
diff --git a/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayer.java b/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayer.java
deleted file mode 100644
index 92962222..00000000
--- a/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayer.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.dueeeke.videoplayer.thunder;
-
-import android.content.res.AssetFileDescriptor;
-import android.text.TextUtils;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-
-import com.aplayer.APlayerAndroid;
-import com.dueeeke.videoplayer.player.AbstractPlayer;
-import com.dueeeke.videoplayer.util.L;
-
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 迅雷APlayer，实验性
- */
-public class ThunderMediaPlayer extends AbstractPlayer {
-
- protected APlayerAndroid mAPlayer;
-
- private String mPath;
-
- private boolean mIsLooping;
-
-
- @Override
- public void initPlayer() {
- mAPlayer = new APlayerAndroid();
-
- setOptions();
-
- mAPlayer.setOnFirstFrameRenderListener(new APlayerAndroid.OnFirstFrameRenderListener() {
- @Override
- public void onFirstFrameRender() {
- mPlayerEventListener.onInfo(AbstractPlayer.MEDIA_INFO_VIDEO_RENDERING_START, 0);
- }
- });
-
- mAPlayer.setOnOpenCompleteListener(new APlayerAndroid.OnOpenCompleteListener() {
- @Override
- public void onOpenComplete(boolean isOpenSuccess) {
- if (isOpenSuccess) {
- mPlayerEventListener.onVideoSizeChanged(mAPlayer.getVideoWidth(), mAPlayer.getVideoHeight());
- mPlayerEventListener.onPrepared();
- } else {
- mPlayerEventListener.onError();
- }
- }
- });
-
- mAPlayer.setOnPlayCompleteListener(new APlayerAndroid.OnPlayCompleteListener() {
- @Override
- public void onPlayComplete(String playRet) {
- L.d("onPlayComplete: " + playRet);
- if (TextUtils.equals(playRet, "0x0")) {
- if (mIsLooping) {
- prepareAsync();
- } else {
- mPlayerEventListener.onCompletion();
- }
- }
- }
- });
-
- mAPlayer.setOnSeekCompleteListener(new APlayerAndroid.OnSeekCompleteListener() {
- @Override
- public void onSeekComplete() {
- mPlayerEventListener.onInfo(AbstractPlayer.MEDIA_INFO_BUFFERING_END, 0);
- }
- });
-
- mAPlayer.setOnBufferListener(new APlayerAndroid.OnBufferListener() {
- @Override
- public void onBuffer(int progress) {
- L.d("onBuffer: " + progress);
- if (progress == 0) {
- mPlayerEventListener.onInfo(AbstractPlayer.MEDIA_INFO_BUFFERING_START, progress);
- }
-
- if (progress == 100) {
- mPlayerEventListener.onInfo(AbstractPlayer.MEDIA_INFO_BUFFERING_END, progress);
- }
- }
- });
- }
-
- @Override
- public void setDataSource(String path, Map headers) {
- mPath = path;
- if (headers != null) {
- StringBuilder sb = new StringBuilder();
- Set> entries = headers.entrySet();
- for (Map.Entry entry : entries) {
- String key = entry.getKey();
- String value = entry.getValue();
- if (TextUtils.equals(key, "User-Agent")) {
- mAPlayer.setConfig(APlayerAndroid.CONFIGID.HTTP_USER_AGENT, value);
- } else {
- sb.append(key).append(":").append(value).append("\r\n");
- }
- }
- mAPlayer.setConfig(APlayerAndroid.CONFIGID.HTTP_CUSTOM_HEADERS, sb.toString());
- }
- }
-
- @Override
- public void setDataSource(AssetFileDescriptor fd) {
-
- }
-
- @Override
- public void start() {
- mAPlayer.play();
- }
-
- @Override
- public void pause() {
- mAPlayer.pause();
- }
-
- @Override
- public void stop() {
- }
-
- @Override
- public void prepareAsync() {
- mAPlayer.setConfig(APlayerAndroid.CONFIGID.AUTO_PLAY, "1");//准备完后自动播放
- if (!TextUtils.isEmpty(mPath)) {
- mAPlayer.open(mPath);
- }
- }
-
- @Override
- public void reset() {
- }
-
- @Override
- public boolean isPlaying() {
- return mAPlayer.getState() == APlayerAndroid.PlayerState.APLAYER_PLAYING;
- }
-
- @Override
- public void seekTo(long time) {
- mPlayerEventListener.onInfo(AbstractPlayer.MEDIA_INFO_BUFFERING_START, 0);
- mAPlayer.setPosition((int) time);
- }
-
- @Override
- public void release() {
- mAPlayer.close();
- mAPlayer.destroy();
- }
-
- @Override
- public long getCurrentPosition() {
- return mAPlayer.getPosition();
- }
-
- @Override
- public long getDuration() {
- return mAPlayer.getDuration();
- }
-
- @Override
- public int getBufferedPercentage() {
- String strPos = mAPlayer.getConfig(APlayerAndroid.CONFIGID.READPOSITION);
- long duration = getDuration();
- if (duration == 0) return 0;
- return (int) (Integer.parseInt(strPos) * 100 / duration);
- }
-
- @Override
- public void setSurface(Surface surface) {
- mAPlayer.setView(surface);
- }
-
- @Override
- public void setDisplay(SurfaceHolder holder) {
- mAPlayer.setView(holder.getSurface());
- }
-
- @Override
- public void setVolume(float v1, float v2) {
- mAPlayer.setVolume((int) v1);
- }
-
- @Override
- public void setLooping(boolean isLooping) {
- mIsLooping = isLooping;
- }
-
- @Override
- public void setOptions() {
- mAPlayer.setConfig(APlayerAndroid.CONFIGID.HTTP_USER_AHTTP2, "1");
- }
-
- @Override
- public void setSpeed(float speed) {
- mAPlayer.setConfig(APlayerAndroid.CONFIGID.PLAY_SPEED, String.valueOf(speed * 100));
- }
-
- @Override
- public float getSpeed() {
- String strSpeed = mAPlayer.getConfig(APlayerAndroid.CONFIGID.PLAY_SPEED);
- float fSpeed;
- try {
- fSpeed = Float.parseFloat(strSpeed);
- } catch (NumberFormatException e) {
- fSpeed = 1f;
- }
- return fSpeed;
- }
-
- @Override
- public long getTcpSpeed() {
- return Long.parseLong(mAPlayer.getConfig(APlayerAndroid.CONFIGID.DOWN_SPEED));
- }
-}
diff --git a/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayerFactory.java b/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayerFactory.java
deleted file mode 100644
index 42bd64b3..00000000
--- a/dkplayer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayerFactory.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dueeeke.videoplayer.thunder;
-
-import android.content.Context;
-
-import com.dueeeke.videoplayer.player.PlayerFactory;
-
-public class ThunderMediaPlayerFactory extends PlayerFactory {
-
- public static ThunderMediaPlayerFactory create() {
- return new ThunderMediaPlayerFactory();
- }
-
- @Override
- public ThunderMediaPlayer createPlayer(Context context) {
- return new ThunderMediaPlayer();
- }
-}
diff --git a/dkplayer-sample/build.gradle b/dkplayer-sample/build.gradle
index 3c4826d2..d0373c81 100644
--- a/dkplayer-sample/build.gradle
+++ b/dkplayer-sample/build.gradle
@@ -69,12 +69,6 @@ android {
}
}
-repositories {
- flatDir {
- dirs project(':dkplayer-players:thunder').file('libs')
- }
-}
-
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0'
@@ -93,7 +87,6 @@ dependencies {
implementation project(':dkplayer-ui')
implementation project(path: ':dkplayer-players:ijk')
implementation project(path: ':dkplayer-players:exo')
- implementation project(path: ':dkplayer-players:thunder')
//缓存
implementation project(':dkplayer-videocache')
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java
index 3416996b..2aa98f5e 100644
--- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java
+++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java
@@ -25,7 +25,6 @@
import com.dueeeke.videoplayer.player.PlayerFactory;
import com.dueeeke.videoplayer.player.VideoViewConfig;
import com.dueeeke.videoplayer.player.VideoViewManager;
-import com.dueeeke.videoplayer.thunder.ThunderMediaPlayerFactory;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.yanzhenjie.permission.AndPermission;
import com.yanzhenjie.permission.runtime.Permission;
@@ -66,8 +65,6 @@ protected void initView() {
setTitle(getResources().getString(R.string.app_name) + " (IjkPlayer)");
} else if (factory instanceof AndroidMediaPlayerFactory) {
setTitle(getResources().getString(R.string.app_name) + " (MediaPlayer)");
- } else if (factory instanceof ThunderMediaPlayerFactory) {
- setTitle(getResources().getString(R.string.app_name) + " (APlayer)");
} else {
setTitle(getResources().getString(R.string.app_name) + " (unknown)");
}
@@ -105,7 +102,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
break;
}
- if (itemId == R.id.ijk || itemId == R.id.exo || itemId == R.id.media || itemId == R.id.thunder) {
+ if (itemId == R.id.ijk || itemId == R.id.exo || itemId == R.id.media) {
//切换播放核心，不推荐这么做，我这么写只是为了方便测试
VideoViewConfig config = VideoViewManager.getConfig();
try {
@@ -125,10 +122,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
playerFactory = AndroidMediaPlayerFactory.create();
setTitle(getResources().getString(R.string.app_name) + " (MediaPlayer)");
break;
- case R.id.thunder:
- playerFactory = ThunderMediaPlayerFactory.create();
- setTitle(getResources().getString(R.string.app_name) + " (APlayer)");
- break;
}
mPlayerFactoryField.set(config, playerFactory);
} catch (Exception e) {
diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java
index ea643467..5af55ff2 100644
--- a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java
+++ b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java
@@ -19,7 +19,6 @@
import com.dueeeke.videoplayer.exo.ExoMediaPlayerFactory;
import com.dueeeke.videoplayer.ijk.IjkPlayerFactory;
import com.dueeeke.videoplayer.player.AndroidMediaPlayerFactory;
-import com.dueeeke.videoplayer.thunder.ThunderMediaPlayerFactory;
/**
* 调试信息
@@ -88,8 +87,6 @@ protected String getCurrentPlayer() {
player = "IjkPlayer";
} else if (playerFactory instanceof AndroidMediaPlayerFactory) {
player = "MediaPlayer";
- } else if (playerFactory instanceof ThunderMediaPlayerFactory) {
- player = "APlayer";
} else {
player = "unknown";
}
diff --git a/dkplayer-sample/src/main/res/menu/main_menu.xml b/dkplayer-sample/src/main/res/menu/main_menu.xml
index 6ddd118d..ce76393b 100644
--- a/dkplayer-sample/src/main/res/menu/main_menu.xml
+++ b/dkplayer-sample/src/main/res/menu/main_menu.xml
@@ -15,8 +15,6 @@
android:title="ExoPlayer"/>