新增获取播放速度的方法

Doikki · Doikki · commit 3516a9c11b9d · 2020-03-10T16:30:34.000+08:00
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/BaseVideoController.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/BaseVideoController.java
@@ -252,7 +252,7 @@ public void stopFadeOut() {
     /**
      * 隐藏播放视图Runnable
      */
-    public final Runnable mFadeOut = new Runnable() {
+    protected final Runnable mFadeOut = new Runnable() {
         @Override
         public void run() {
             hide();
@@ -293,12 +293,12 @@ public void stopProgress() {
     /**
      * 刷新进度Runnable
      */
-    private Runnable mShowProgress = new Runnable() {
+    protected Runnable mShowProgress = new Runnable() {
         @Override
         public void run() {
             int pos = setProgress();
             if (mControlWrapper.isPlaying()) {
-                postDelayed(mShowProgress, 1000 - (pos % 1000));
+                postDelayed(this, (long) ((1000  - pos % 1000) / mControlWrapper.getSpeed()));
             } else {
                 mIsStartProgress = false;
             }
@@ -534,8 +534,9 @@ private void handleVisibilityChanged(boolean isVisible, Animation anim) {
 
     /**
      * 子类重写此方法监听控制的显示和隐藏
+     *
      * @param isVisible 是否可见
-     * @param anim 显示/隐藏动画
+     * @param anim      显示/隐藏动画
      */
     protected void onVisibilityChanged(boolean isVisible, Animation anim) {
 
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/ControlWrapper.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/ControlWrapper.java
@@ -90,6 +90,11 @@ public void setSpeed(float speed) {
         mPlayerControl.setSpeed(speed);
     }
 
+    @Override
+    public float getSpeed() {
+        return mPlayerControl.getSpeed();
+    }
+
     @Override
     public long getTcpSpeed() {
         return mPlayerControl.getTcpSpeed();
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/MediaPlayerControl.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/controller/MediaPlayerControl.java
@@ -32,6 +32,8 @@ public interface MediaPlayerControl {
 
     void setSpeed(float speed);
 
+    float getSpeed();
+
     long getTcpSpeed();
 
     void replay(boolean resetPosition);
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AbstractPlayer.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AbstractPlayer.java
@@ -140,6 +140,11 @@ public abstract class AbstractPlayer {
      */
     public abstract void setSpeed(float speed);
 
+    /**
+     * 获取播放速度
+     */
+    public abstract float getSpeed();
+
     /**
      * 获取当前缓冲的网速
      */
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AndroidMediaPlayer.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/AndroidMediaPlayer.java
@@ -194,6 +194,19 @@ public void setSpeed(float speed) {
         }
     }
 
+    @Override
+    public float getSpeed() {
+        // only support above Android M
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            try {
+                return mMediaPlayer.getPlaybackParams().getSpeed();
+            } catch (Exception e) {
+                mPlayerEventListener.onError();
+            }
+        }
+        return 1f;
+    }
+
     @Override
     public long getTcpSpeed() {
         // no support
diff --git a/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java b/dkplayer-java/src/main/java/com/dueeeke/videoplayer/player/VideoView.java
@@ -601,6 +601,14 @@ public void setSpeed(float speed) {
         }
     }
 
+    @Override
+    public float getSpeed() {
+        if (isInPlaybackState()) {
+            return mMediaPlayer.getSpeed();
+        }
+        return 1f;
+    }
+
     /**
      * 设置视频地址
      */
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
@@ -264,6 +264,14 @@ public void setSpeed(float speed) {
         }
     }
 
+    @Override
+    public float getSpeed() {
+        if (mSpeedPlaybackParameters != null) {
+            return mSpeedPlaybackParameters.speed;
+        }
+        return 1f;
+    }
+
     @Override
     public long getTcpSpeed() {
         // no support
diff --git a/dkplayer-players/ijk/src/main/java/com/dueeeke/videoplayer/ijk/IjkPlayer.java b/dkplayer-players/ijk/src/main/java/com/dueeeke/videoplayer/ijk/IjkPlayer.java
@@ -202,6 +202,11 @@ public void setSpeed(float speed) {
         mMediaPlayer.setSpeed(speed);
     }
 
+    @Override
+    public float getSpeed() {
+        return mMediaPlayer.getSpeed(0);
+    }
+
     @Override
     public long getTcpSpeed() {
         return mMediaPlayer.getTcpSpeed();
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
@@ -200,6 +200,18 @@ 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));

Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,14 @@ public void setSpeed(float speed) {`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`
	`604`	`+ @Override`
	`605`	`+ public float getSpeed() {`
	`606`	`+ if (isInPlaybackState()) {`
	`607`	`+ return mMediaPlayer.getSpeed();`
	`608`	`+ }`
	`609`	`+ return 1f;`
	`610`	`+ }`
	`611`	`+`
`604`	`612`	`/**`
`605`	`613`	`* 设置视频地址`
`606`	`614`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,14 @@ public void setSpeed(float speed) {`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`
	`267`	`+ @Override`
	`268`	`+ public float getSpeed() {`
	`269`	`+ if (mSpeedPlaybackParameters != null) {`
	`270`	`+ return mSpeedPlaybackParameters.speed;`
	`271`	`+ }`
	`272`	`+ return 1f;`
	`273`	`+ }`
	`274`	`+`
`267`	`275`	`@Override`
`268`	`276`	`public long getTcpSpeed() {`
`269`	`277`	`// no support`