Clean ijk code

Y-B-S · May 9, 2023 · dce87a9 · dce87a9
1 parent 7b84f16
commit dce87a9
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java
@@ -97,7 +97,6 @@ public void addListener(IMediaPlayer.Listener listener) {
 
     public void setRender(int render) {
         mCurrentRender = render;
-        if (mPlayer == null) return;
         switch (render) {
             case RENDER_TEXTURE_VIEW:
                 setRenderView(new TextureRenderView(getContext()));
@@ -146,8 +145,6 @@ private void openVideo(Uri uri, Map<String, String> headers) {
             fixUserAgent(headers);
             setSpeed(mCurrentSpeed);
             setRender(mCurrentRender);
-            mCurrentBufferPosition = 0;
-            mCurrentBufferPercentage = 0;
             mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
             mPlayer.setDataSource(getContext(), uri, headers);
             mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
@@ -198,20 +195,23 @@ public void stop() {
         if (mPlayer == null) return;
         mPlayer.stop();
         mPlayer.reset();
-        mTargetState = STATE_IDLE;
-        mCurrentState = STATE_IDLE;
-        mAudioManager.abandonAudioFocus(null);
+        reset();
     }
 
     public void release() {
         if (mPlayer == null) return;
-        mSubtitleView.setText("");
         removeRenderView();
-        mPlayer.reset();
         mPlayer.release();
         mPlayer = null;
+        reset();
+    }
+
+    private void reset() {
+        mSubtitleView.setText("");
         mTargetState = STATE_IDLE;
         mCurrentState = STATE_IDLE;
+        mCurrentBufferPosition = 0;
+        mCurrentBufferPercentage = 0;
         mAudioManager.abandonAudioFocus(null);
     }