From bd76c0245cef9d95a9be1c809b11046747d324fd Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 10:35:10 +0800 Subject: [PATCH 01/11] Fix regex --- .../java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 bc44f331d..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 @@ -165,11 +165,13 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { private PowerManager.WakeLock mWakeLock = null; private boolean mScreenOnWhilePlaying; private boolean mStayAwake; + private boolean dotOpen; private int mVideoWidth; private int mVideoHeight; private int mVideoSarNum; private int mVideoSarDen; + private int dotPort; private String mDataSource; @@ -197,6 +199,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { synchronized (IjkMediaPlayer.class) { if (!mIsNativeInitialized) { native_init(); + native_setDot(0); mIsNativeInitialized = true; } } @@ -379,7 +382,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { } private String encodeSpaceChinese(String str) throws UnsupportedEncodingException { - Pattern p = Pattern.compile("[\u4e00-\u9fa5 ]+"); + Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); Matcher m = p.matcher(str); StringBuffer b = new StringBuffer(); while (m.find()) m.appendReplacement(b, URLEncoder.encode(m.group(0), "UTF-8")); From a4caad3237bdf8353a83928cc79d62cac140936c Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 10:46:18 +0800 Subject: [PATCH 02/11] Fix crash --- drpy/build.gradle | 1 + drpy/src/main/java/com/hiker/drpy/Spider.java | 1 + 2 files changed, 2 insertions(+) diff --git a/drpy/build.gradle b/drpy/build.gradle index 6f8449194..011cf48c2 100644 --- a/drpy/build.gradle +++ b/drpy/build.gradle @@ -8,6 +8,7 @@ android { defaultConfig { minSdk 21 targetSdk 33 + ndk { abiFilters "armeabi-v7a" } } } diff --git a/drpy/src/main/java/com/hiker/drpy/Spider.java b/drpy/src/main/java/com/hiker/drpy/Spider.java index 05f9be827..adde40023 100644 --- a/drpy/src/main/java/com/hiker/drpy/Spider.java +++ b/drpy/src/main/java/com/hiker/drpy/Spider.java @@ -84,6 +84,7 @@ public class Spider extends com.github.catvod.crawler.Spider { public void destroy() { submit(() -> { + executor.shutdownNow(); QuickJSContext.destroy(ctx); QuickJSContext.destroyRuntime(ctx); }); From 49ef13f953a3b6c7ca21f00b015f375309afd19d Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 10:56:21 +0800 Subject: [PATCH 04/11] Update dev --- drpy/src/main/java/com/hiker/drpy/Spider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/drpy/src/main/java/com/hiker/drpy/Spider.java b/drpy/src/main/java/com/hiker/drpy/Spider.java index adde40023..047fa1c99 100644 --- a/drpy/src/main/java/com/hiker/drpy/Spider.java +++ b/drpy/src/main/java/com/hiker/drpy/Spider.java @@ -86,7 +86,6 @@ public class Spider extends com.github.catvod.crawler.Spider { submit(() -> { executor.shutdownNow(); QuickJSContext.destroy(ctx); - QuickJSContext.destroyRuntime(ctx); }); } From 889ac13dcb88cd7c6652f096ab3cca128a69ffde Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 12:05:28 +0800 Subject: [PATCH 05/11] Update IjkVideoView.java --- .../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 ab0317df9..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 @@ -145,7 +145,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl } public void setMediaSource(String path, Map headers) { - setVideoURI(Uri.parse(path), headers); + setVideoURI(Uri.parse(path.trim()), headers); } public void setVideoURI(Uri uri, Map headers) { From 17d61c1affd190d67aaddd419013beaca91fb52c Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 12:44:22 +0800 Subject: [PATCH 06/11] Update IjkVideoView.java --- .../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 b2c6a49ac..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", 15 * 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 b175109bd8c62ce66fa63dab8c1b2c2c82e3d26e Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 13:19:12 +0800 Subject: [PATCH 07/11] Update IjkMediaPlayer.java --- .../main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java | 1 - 1 file changed, 1 deletion(-) 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 6d48dfd54..061e551c2 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,7 +199,6 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { synchronized (IjkMediaPlayer.class) { if (!mIsNativeInitialized) { native_init(); - native_setDot(0); mIsNativeInitialized = true; } } From 20fef4c6c08a0ea55febb3705dea6d263e04ce4e Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 13:42:11 +0800 Subject: [PATCH 08/11] Update ijk --- .../main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 3 +++ 1 file changed, 3 insertions(+) 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..a37268d90 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 @@ -508,15 +508,18 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl 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, "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 43ada0d2c7a8e65a80f8f2e38d4fadafad90ee6d Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 14:21:41 +0800 Subject: [PATCH 10/11] Update IjkVideoView.java --- .../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 a37268d90..d444d4c33 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,19 +507,16 @@ 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", 50 * 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 51d943e45236ad8e5c06459c35b1d07a1e6053f0 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Dec 2022 14:48:35 +0800 Subject: [PATCH 11/11] Update to 1.5.1 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02241df62..acd4486ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 33 - versionCode 50 - versionName "1.5.0" + versionCode 51 + versionName "1.5.1" ndk { abiFilters "armeabi-v7a" } }