fix #3999 & #3649 system mediaPlayer setSpeed cause play

CarGuo · Jun 17, 2024 · f8d7a19 · f8d7a19
1 parent 967cc6d
commit f8d7a19
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java b/app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java
@@ -198,19 +198,19 @@ public void onEnterFullscreen(String url, Object... objects) {
                 @Override
                 public void onAutoComplete(String url, Object... objects) {
                     super.onAutoComplete(url, objects);
-                    IPlayerManager playerManager = binding.detailPlayer.getGSYVideoManager().getPlayer();
-                    if (playerManager instanceof SystemPlayerManager) {
-                        playerManager.release();
-                    }
+//                    IPlayerManager playerManager = binding.detailPlayer.getGSYVideoManager().getPlayer();
+//                    if (playerManager instanceof SystemPlayerManager) {
+//                        playerManager.release();
+//                    }
                 }
 
                 @Override
                 public void onComplete(String url, Object... objects) {
                     super.onComplete(url, objects);
-                    IPlayerManager playerManager = binding.detailPlayer.getGSYVideoManager().getPlayer();
-                    if (playerManager instanceof SystemPlayerManager) {
-                        playerManager.release();
-                    }
+//                    IPlayerManager playerManager = binding.detailPlayer.getGSYVideoManager().getPlayer();
+//                    if (playerManager instanceof SystemPlayerManager) {
+//                        playerManager.release();
+//                    }
                 }
 
                 @Override

diff --git a/app/src/main/java/com/example/gsyvideoplayer/simple/SimplePlayer.java b/app/src/main/java/com/example/gsyvideoplayer/simple/SimplePlayer.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
     private void init() {
         videoPlayer =  (StandardGSYVideoPlayer)findViewById(R.id.video_player);
 
-        String source1 = "http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4";
+        String source1 = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear3/prog_index.m3u8";
         videoPlayer.setUp(source1, true, "测试视频");
 
         //增加封面
@@ -50,8 +50,8 @@ private void init() {
             public void onClick(View v) {
                 // ------- ！！！如果不需要旋转屏幕，可以不调用！！！-------
                 // 不需要屏幕旋转，还需要设置 setNeedOrientationUtils(false)
-                //orientationUtils.resolveByClick();
-                finish();
+                orientationUtils.resolveByClick();
+                //finish();
             }
         });
         //是否可以滑动调整

diff --git a/...ideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java b/...ideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYBaseVideoPlayer.java
@@ -270,7 +270,7 @@ protected void cloneParams(GSYBaseVideoPlayer from, GSYBaseVideoPlayer to) {
         }
         to.setLooping(from.isLooping());
         to.setIsTouchWigetFull(from.mIsTouchWigetFull);
-        to.setSpeed(from.getSpeed(), from.mSoundTouch);
+        to.setSpeed(from.getSpeed(), from.mSoundTouch, false);
         to.setStateAndUi(from.mCurrentState);
     }
 

diff --git a/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYVideoView.java b/gsyVideoPlayer-java/src/main/java/com/shuyu/gsyvideoplayer/video/base/GSYVideoView.java
@@ -1055,7 +1055,7 @@ public float getSpeed() {
      * 播放速度
      */
     public void setSpeed(float speed) {
-        setSpeed(speed, false);
+        setSpeed(speed, false, true);
     }
 
     /**
@@ -1065,9 +1065,20 @@ public void setSpeed(float speed) {
      * @param soundTouch 是否对6.0下开启变速不变调
      */
     public void setSpeed(float speed, boolean soundTouch) {
+        setSpeed(speed, soundTouch, true);
+    }
+
+    /**
+     * 播放速度
+     *
+     * @param speed      速度
+     * @param soundTouch 是否对6.0下开启变速不变调
+     * @param workRightNow 是否立刻生效
+     */
+    public void setSpeed(float speed, boolean soundTouch, boolean workRightNow) {
         this.mSpeed = speed;
         this.mSoundTouch = soundTouch;
-        if (getGSYVideoManager() != null) {
+        if (getGSYVideoManager() != null && workRightNow) {
             getGSYVideoManager().setSpeed(speed, soundTouch);
         }
     }