From 0c7890f6fee1f369b2cf8adae63768473fafaf98 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 1 Feb 2023 12:02:24 +0800 Subject: [PATCH] Update ijk player --- .../java/tv/danmaku/ijk/media/player/IMediaPlayer.java | 3 +++ .../tv/danmaku/ijk/media/player/IjkMediaPlayer.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java index 7b16f8262..f69cf6788 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java @@ -19,6 +19,7 @@ package tv.danmaku.ijk.media.player; import android.annotation.TargetApi; import android.content.Context; +import android.graphics.Bitmap; import android.net.Uri; import android.os.Build; import android.view.Surface; @@ -102,6 +103,8 @@ public interface IMediaPlayer { void seekTo(long msec) throws IllegalStateException; + boolean getCurrentFrame(Bitmap bitmap); + long getCurrentPosition(); long getDuration(); 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 272760458..1575d5d0c 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 @@ -21,6 +21,7 @@ package tv.danmaku.ijk.media.player; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; +import android.graphics.Bitmap; import android.graphics.SurfaceTexture; import android.media.MediaCodecInfo; import android.media.MediaCodecList; @@ -187,7 +188,7 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { if (libLoader == null) libLoader = sLocalLibLoader; libLoader.loadLibrary("ijkffmpeg"); libLoader.loadLibrary("ijksdl"); - libLoader.loadLibrary("player"); + libLoader.loadLibrary("ijkplayer"); mIsLibLoaded = true; } } @@ -199,7 +200,6 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { synchronized (IjkMediaPlayer.class) { if (!mIsNativeInitialized) { native_init(); - native_setDot(0); native_setLogLevel(IjkMediaPlayer.IJK_LOG_SILENT); mIsNativeInitialized = true; } @@ -410,7 +410,6 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { if (!TextUtils.isEmpty(value)) sb.append(entry.getValue()); sb.append("\r\n"); setOption(OPT_CATEGORY_FORMAT, "headers", sb.toString()); - setOption(OPT_CATEGORY_FORMAT, "allowed_extensions", "ALL"); setOption(IjkMediaPlayer.OPT_CATEGORY_FORMAT, "protocol_whitelist", "async,cache,crypto,file,http,https,ijkhttphook,ijkinject,ijklivehook,ijklongurl,ijksegment,ijktcphook,pipe,rtp,tcp,tls,udp,ijkurlhook,data"); } } @@ -609,6 +608,9 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { @Override public native void seekTo(long msec) throws IllegalStateException; + @Override + public native boolean getCurrentFrame(Bitmap bitmap); + @Override public native long getCurrentPosition(); @@ -1154,6 +1156,4 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer { public static native void native_profileEnd(); public static native void native_setLogLevel(int level); - - public static native void native_setDot(int port); }