Merge branch 'dev' into release

pull/137/head
FongMi 3 years ago
commit fd872d4f6c
  1. 4
      app/build.gradle
  2. 1
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
  3. 2
      ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java

@ -10,8 +10,8 @@ android {
applicationId "com.fongmi.android.tv"
minSdk 21
targetSdk 33
versionCode 51
versionName "1.5.1"
versionCode 52
versionName "1.5.2"
ndk { abiFilters "armeabi-v7a" }
}

@ -199,6 +199,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
synchronized (IjkMediaPlayer.class) {
if (!mIsNativeInitialized) {
native_init();
native_setDot(0);
mIsNativeInitialized = true;
}
}

@ -507,7 +507,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl
mIjkPlayer.setOption(format, "http-detect-range-support", 0);
mIjkPlayer.setOption(player, "enable-accurate-seek", 0);
mIjkPlayer.setOption(player, "framedrop", 1);
mIjkPlayer.setOption(player, "max-buffer-size", 50 * 1024 * 1024);
mIjkPlayer.setOption(player, "max-buffer-size", 15 * 1024 * 1024);
mIjkPlayer.setOption(player, "mediacodec", mCurrentDecode);
mIjkPlayer.setOption(player, "mediacodec-auto-rotate", mCurrentDecode);
mIjkPlayer.setOption(player, "mediacodec-handle-resolution-change", mCurrentDecode);

Loading…
Cancel
Save