Clean ijk code

pull/123/head
FongMi 3 years ago
parent 7b84f16b7e
commit dce87a94b5
  1. 16
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java

@ -97,7 +97,6 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl
public void setRender(int render) { public void setRender(int render) {
mCurrentRender = render; mCurrentRender = render;
if (mPlayer == null) return;
switch (render) { switch (render) {
case RENDER_TEXTURE_VIEW: case RENDER_TEXTURE_VIEW:
setRenderView(new TextureRenderView(getContext())); setRenderView(new TextureRenderView(getContext()));
@ -146,8 +145,6 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl
fixUserAgent(headers); fixUserAgent(headers);
setSpeed(mCurrentSpeed); setSpeed(mCurrentSpeed);
setRender(mCurrentRender); setRender(mCurrentRender);
mCurrentBufferPosition = 0;
mCurrentBufferPercentage = 0;
mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN); mAudioManager.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
mPlayer.setDataSource(getContext(), uri, headers); mPlayer.setDataSource(getContext(), uri, headers);
mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
@ -198,20 +195,23 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl
if (mPlayer == null) return; if (mPlayer == null) return;
mPlayer.stop(); mPlayer.stop();
mPlayer.reset(); mPlayer.reset();
mTargetState = STATE_IDLE; reset();
mCurrentState = STATE_IDLE;
mAudioManager.abandonAudioFocus(null);
} }
public void release() { public void release() {
if (mPlayer == null) return; if (mPlayer == null) return;
mSubtitleView.setText("");
removeRenderView(); removeRenderView();
mPlayer.reset();
mPlayer.release(); mPlayer.release();
mPlayer = null; mPlayer = null;
reset();
}
private void reset() {
mSubtitleView.setText("");
mTargetState = STATE_IDLE; mTargetState = STATE_IDLE;
mCurrentState = STATE_IDLE; mCurrentState = STATE_IDLE;
mCurrentBufferPosition = 0;
mCurrentBufferPercentage = 0;
mAudioManager.abandonAudioFocus(null); mAudioManager.abandonAudioFocus(null);
} }

Loading…
Cancel
Save