From 2a58f7c0cd23f78ab4d2788c355e095eeb7e7aab Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 18:11:30 +0800 Subject: [PATCH 1/6] Update dev --- .../main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d444d4c33..05419135a 100644 --- 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 @@ -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", 500 * 1024 * 1024); mIjkPlayer.setOption(player, "mediacodec", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-auto-rotate", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-handle-resolution-change", mCurrentDecode); From db9f2c95ce931988cef28f3f3ebf22041dea9aac Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 18:41:07 +0800 Subject: [PATCH 2/6] Update dev --- .../java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 index 05419135a..a7e347d9f 100644 --- 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 @@ -507,16 +507,19 @@ 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", 500 * 1024 * 1024); + mIjkPlayer.setOption(player, "max-fps", 120); + mIjkPlayer.setOption(player, "max-buffer-size", 512 * 1024 * 1024); mIjkPlayer.setOption(player, "mediacodec", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-auto-rotate", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-handle-resolution-change", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-hevc", mCurrentDecode); mIjkPlayer.setOption(player, "opensles", 0); mIjkPlayer.setOption(player, "overlay-format", IjkMediaPlayer.SDL_FCC_RV32); + mIjkPlayer.setOption(player, "render-wait-start", 1); mIjkPlayer.setOption(player, "reconnect", 1); mIjkPlayer.setOption(player, "soundtouch", 1); mIjkPlayer.setOption(player, "start-on-prepared", 1); + mIjkPlayer.setOption(player, "sync-av-start", 1); mIjkPlayer.setOption(player, "subtitle", 1); if (mUri.getScheme() != null && mUri.getScheme().startsWith("rtsp")) { mIjkPlayer.setOption(format, "infbuf", 1); From 991dfd139af7238ea0c8ded8cff41c60db99671d Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 18:44:01 +0800 Subject: [PATCH 3/6] Update IjkVideoView.java --- .../java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index a7e347d9f..54a10defa 100644 --- 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 @@ -507,20 +507,20 @@ 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-fps", 120); mIjkPlayer.setOption(player, "max-buffer-size", 512 * 1024 * 1024); + mIjkPlayer.setOption(player, "max-fps", 120); mIjkPlayer.setOption(player, "mediacodec", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-auto-rotate", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-handle-resolution-change", mCurrentDecode); mIjkPlayer.setOption(player, "mediacodec-hevc", mCurrentDecode); mIjkPlayer.setOption(player, "opensles", 0); mIjkPlayer.setOption(player, "overlay-format", IjkMediaPlayer.SDL_FCC_RV32); - mIjkPlayer.setOption(player, "render-wait-start", 1); mIjkPlayer.setOption(player, "reconnect", 1); + mIjkPlayer.setOption(player, "render-wait-start", 1); mIjkPlayer.setOption(player, "soundtouch", 1); mIjkPlayer.setOption(player, "start-on-prepared", 1); - mIjkPlayer.setOption(player, "sync-av-start", 1); mIjkPlayer.setOption(player, "subtitle", 1); + mIjkPlayer.setOption(player, "sync-av-start", 1); if (mUri.getScheme() != null && mUri.getScheme().startsWith("rtsp")) { mIjkPlayer.setOption(format, "infbuf", 1); mIjkPlayer.setOption(format, "rtsp_transport", "tcp"); From 60f686e6002aea06b749153e424cce7371a26139 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 18:50:55 +0800 Subject: [PATCH 4/6] Update dev --- .../main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java index 061e551c2..6d48dfd54 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java @@ -199,6 +199,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { synchronized (IjkMediaPlayer.class) { if (!mIsNativeInitialized) { native_init(); + native_setDot(0); mIsNativeInitialized = true; } } From 41227f826c18d19074120c3b9dee7d6c97852588 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 19:19:59 +0800 Subject: [PATCH 5/6] Revert ijk --- .../java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 5 +---- 1 file changed, 1 insertion(+), 4 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 index 54a10defa..b2c6a49ac 100644 --- 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 @@ -507,8 +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", 512 * 1024 * 1024); - mIjkPlayer.setOption(player, "max-fps", 120); + 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); @@ -516,11 +515,9 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl mIjkPlayer.setOption(player, "opensles", 0); mIjkPlayer.setOption(player, "overlay-format", IjkMediaPlayer.SDL_FCC_RV32); mIjkPlayer.setOption(player, "reconnect", 1); - mIjkPlayer.setOption(player, "render-wait-start", 1); mIjkPlayer.setOption(player, "soundtouch", 1); mIjkPlayer.setOption(player, "start-on-prepared", 1); mIjkPlayer.setOption(player, "subtitle", 1); - mIjkPlayer.setOption(player, "sync-av-start", 1); if (mUri.getScheme() != null && mUri.getScheme().startsWith("rtsp")) { mIjkPlayer.setOption(format, "infbuf", 1); mIjkPlayer.setOption(format, "rtsp_transport", "tcp"); From 2a4cc6339ddf894e4c82b18cefb33619ffa978d8 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 19:29:52 +0800 Subject: [PATCH 6/6] Update to 1.5.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index acd4486ad..a1812b25a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" } }