update

android/src/main/java/top/kikt/ijkplayer2/FileMediaDataSource.java

@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
 
 public class FileMediaDataSource implements IMediaDataSource {
     private RandomAccessFile mFile;

android/src/main/java/top/kikt/ijkplayer2/Ijk.kt

@@ -15,8 +15,8 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.PluginRegistry
 import top.kikt.ijkplayer2.entity.IjkOption
 import top.kikt.ijkplayer2.entity.Info
-import tv.danmaku.ijk.media.player2.IjkMediaPlayer
-import tv.danmaku.ijk.media.player2.TextureMediaPlayer
+import tv.danmaku.ijk.media.player.IjkMediaPlayer
+import tv.danmaku.ijk.media.player.TextureMediaPlayer
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream

android/src/main/java/top/kikt/ijkplayer2/NotifyChannel.kt

@@ -2,7 +2,7 @@ package top.kikt.ijkplayer2
 
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.PluginRegistry
-import tv.danmaku.ijk.media.player2.IMediaPlayer
+import tv.danmaku.ijk.media.player.IMediaPlayer
 
 class NotifyChannel(val registry: PluginRegistry.Registrar, val textureId: Long, val ijk: Ijk) {
 

android/src/main/java/tv/danmaku/ijk/media/player2/AbstractMediaPlayer.java → android/src/main/java/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
 
 @SuppressWarnings("WeakerAccess")
 public abstract class AbstractMediaPlayer implements IMediaPlayer {

android/src/main/java/tv/danmaku/ijk/media/player2/AndroidMediaPlayer.java → android/src/main/java/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -35,10 +35,10 @@
 import java.lang.ref.WeakReference;
 import java.util.Map;
 
-import tv.danmaku.ijk.media.player2.misc.AndroidTrackInfo;
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
-import tv.danmaku.ijk.media.player2.misc.ITrackInfo;
-import tv.danmaku.ijk.media.player2.pragma.DebugLog;
+import tv.danmaku.ijk.media.player.misc.AndroidTrackInfo;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.ITrackInfo;
+import tv.danmaku.ijk.media.player.pragma.DebugLog;
 
 public class AndroidMediaPlayer extends AbstractMediaPlayer {
     private final MediaPlayer mInternalMediaPlayer;

android/src/main/java/tv/danmaku/ijk/media/player2/IMediaPlayer.java → android/src/main/java/tv/danmaku/ijk/media/player/IMediaPlayer.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -28,8 +28,8 @@
 import java.io.IOException;
 import java.util.Map;
 
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
-import tv.danmaku.ijk.media.player2.misc.ITrackInfo;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.ITrackInfo;
 
 public interface IMediaPlayer {
     /*

android/src/main/java/tv/danmaku/ijk/media/player2/ISurfaceTextureHolder.java → android/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHolder.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.graphics.SurfaceTexture;
 

android/src/main/java/tv/danmaku/ijk/media/player2/ISurfaceTextureHost.java → android/src/main/java/tv/danmaku/ijk/media/player/ISurfaceTextureHost.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.graphics.SurfaceTexture;
 

android/src/main/java/tv/danmaku/ijk/media/player2/IjkLibLoader.java → android/src/main/java/tv/danmaku/ijk/media/player/IjkLibLoader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 public interface IjkLibLoader {
     void loadLibrary(String libName) throws UnsatisfiedLinkError,

android/src/main/java/tv/danmaku/ijk/media/player2/IjkMediaCodecInfo.java → android/src/main/java/tv/danmaku/ijk/media/player/IjkMediaCodecInfo.java

@@ -1,4 +1,4 @@
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.TargetApi;
 import android.media.MediaCodecInfo;

android/src/main/java/tv/danmaku/ijk/media/player2/IjkMediaMeta.java → android/src/main/java/tv/danmaku/ijk/media/player/IjkMediaMeta.java

@@ -1,4 +1,4 @@
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.os.Bundle;
 import android.text.TextUtils;

android/src/main/java/tv/danmaku/ijk/media/player2/IjkMediaPlayer.java → android/src/main/java/tv/danmaku/ijk/media/player/IjkMediaPlayer.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
@@ -55,13 +55,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import tv.danmaku.ijk.media.player2.annotations.AccessedByNative;
-import tv.danmaku.ijk.media.player2.annotations.CalledByNative;
-import tv.danmaku.ijk.media.player2.misc.IAndroidIO;
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
-import tv.danmaku.ijk.media.player2.misc.ITrackInfo;
-import tv.danmaku.ijk.media.player2.misc.IjkTrackInfo;
-import tv.danmaku.ijk.media.player2.pragma.DebugLog;
+import tv.danmaku.ijk.media.player.annotations.AccessedByNative;
+import tv.danmaku.ijk.media.player.annotations.CalledByNative;
+import tv.danmaku.ijk.media.player.misc.IAndroidIO;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.ITrackInfo;
+import tv.danmaku.ijk.media.player.misc.IjkTrackInfo;
+import tv.danmaku.ijk.media.player.pragma.DebugLog;
 
 /**
  * @author bbcallen
@@ -190,9 +190,9 @@ public static void loadLibrariesOnce(IjkLibLoader libLoader) {
                 if (libLoader == null)
                     libLoader = sLocalLibLoader;
 
-                libLoader.loadLibrary("ijkffmpeg");
-                libLoader.loadLibrary("ijksdl");
-                libLoader.loadLibrary("ijkplayer");
+                libLoader.loadLibrary("ijkffmpeg2");
+                libLoader.loadLibrary("ijksdl2");
+                libLoader.loadLibrary("ijkplayer2");
                 mIsLibLoaded = true;
             }
         }

android/src/main/java/tv/danmaku/ijk/media/player2/IjkTimedText.java → android/src/main/java/tv/danmaku/ijk/media/player/IjkTimedText.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.graphics.Rect;
 import java.lang.String;

android/src/main/java/tv/danmaku/ijk/media/player2/MediaInfo.java → android/src/main/java/tv/danmaku/ijk/media/player/MediaInfo.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 public class MediaInfo {
     public String mMediaPlayerName;

android/src/main/java/tv/danmaku/ijk/media/player2/MediaPlayerProxy.java → android/src/main/java/tv/danmaku/ijk/media/player/MediaPlayerProxy.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -28,8 +28,8 @@
 import java.io.IOException;
 import java.util.Map;
 
-import tv.danmaku.ijk.media.player2.misc.IMediaDataSource;
-import tv.danmaku.ijk.media.player2.misc.ITrackInfo;
+import tv.danmaku.ijk.media.player.misc.IMediaDataSource;
+import tv.danmaku.ijk.media.player.misc.ITrackInfo;
 
 public class MediaPlayerProxy implements IMediaPlayer {
     protected final IMediaPlayer mBackEndMediaPlayer;

android/src/main/java/tv/danmaku/ijk/media/player2/TextureMediaPlayer.java → android/src/main/java/tv/danmaku/ijk/media/player/TextureMediaPlayer.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2;
+package tv.danmaku.ijk.media.player;
 
 import android.annotation.TargetApi;
 import android.graphics.SurfaceTexture;

android/src/main/java/tv/danmaku/ijk/media/player2/annotations/AccessedByNative.java → android/src/main/java/tv/danmaku/ijk/media/player/annotations/AccessedByNative.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.annotations;
+package tv.danmaku.ijk.media.player.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

android/src/main/java/tv/danmaku/ijk/media/player2/annotations/CalledByNative.java → android/src/main/java/tv/danmaku/ijk/media/player/annotations/CalledByNative.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.annotations;
+package tv.danmaku.ijk.media.player.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

android/src/main/java/tv/danmaku/ijk/media/player2/exceptions/IjkMediaException.java → android/src/main/java/tv/danmaku/ijk/media/player/exceptions/IjkMediaException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.exceptions;
+package tv.danmaku.ijk.media.player.exceptions;
 
 public class IjkMediaException extends Exception {
     private static final long serialVersionUID = 7234796519009099506L;

android/src/main/java/tv/danmaku/ijk/media/player2/ffmpeg/FFmpegApi.java → android/src/main/java/tv/danmaku/ijk/media/player/ffmpeg/FFmpegApi.java

@@ -1,4 +1,4 @@
-package tv.danmaku.ijk.media.player2.ffmpeg;
+package tv.danmaku.ijk.media.player.ffmpeg;
 
 public class FFmpegApi {
     public static native String av_base64_encode(byte in[]);

android/src/main/java/tv/danmaku/ijk/media/player2/misc/AndroidMediaFormat.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidMediaFormat.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import android.annotation.TargetApi;
 import android.media.MediaFormat;

android/src/main/java/tv/danmaku/ijk/media/player2/misc/AndroidTrackInfo.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/AndroidTrackInfo.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import android.annotation.TargetApi;
 import android.media.MediaFormat;

android/src/main/java/tv/danmaku/ijk/media/player2/misc/IAndroidIO.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/IAndroidIO.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import java.io.IOException;
 

android/src/main/java/tv/danmaku/ijk/media/player2/misc/IMediaDataSource.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaDataSource.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import java.io.IOException;
 

android/src/main/java/tv/danmaku/ijk/media/player2/misc/IMediaFormat.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/IMediaFormat.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 public interface IMediaFormat {
     // Common keys

android/src/main/java/tv/danmaku/ijk/media/player2/misc/ITrackInfo.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/ITrackInfo.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 public interface ITrackInfo {
     int MEDIA_TRACK_TYPE_AUDIO = 2;

android/src/main/java/tv/danmaku/ijk/media/player2/misc/IjkMediaFormat.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/IjkMediaFormat.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -25,7 +25,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import tv.danmaku.ijk.media.player2.IjkMediaMeta;
+import tv.danmaku.ijk.media.player.IjkMediaMeta;
 
 public class IjkMediaFormat implements IMediaFormat {
     // Common

android/src/main/java/tv/danmaku/ijk/media/player2/misc/IjkTrackInfo.java → android/src/main/java/tv/danmaku/ijk/media/player/misc/IjkTrackInfo.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.misc;
+package tv.danmaku.ijk.media.player.misc;
 
 import android.text.TextUtils;
 
-import tv.danmaku.ijk.media.player2.IjkMediaMeta;
+import tv.danmaku.ijk.media.player.IjkMediaMeta;
 
 public class IjkTrackInfo implements ITrackInfo {
     private int mTrackType = MEDIA_TRACK_TYPE_UNKNOWN;

android/src/main/java/tv/danmaku/ijk/media/player2/pragma/DebugLog.java → android/src/main/java/tv/danmaku/ijk/media/player/pragma/DebugLog.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tv.danmaku.ijk.media.player2.pragma;
+package tv.danmaku.ijk.media.player.pragma;
 
 import java.util.Locale;
 

android/src/main/java/tv/danmaku/ijk/media/player2/pragma/Pragma.java → android/src/main/java/tv/danmaku/ijk/media/player/pragma/Pragma.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tv.danmaku.ijk.media.player2.pragma;
+package tv.danmaku.ijk.media.player.pragma;
 
 /*-
  * configurated by app project

android/src/main/kotlin/top/kikt/ijkplayer2/IjkplayerPlugin.kt → android/src/main/kotlin/top/kikt/ijkplayer/IjkplayerPlugin.kt

@@ -8,17 +8,17 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry.Registrar
-import tv.danmaku.ijk.media.player2.IjkMediaPlayer
+import tv.danmaku.ijk.media.player.IjkMediaPlayer
 
 
 /**
- * IjkplayerPlugin
+ * Ijkplayer2Plugin
  */
-class IjkplayerPlugin(private val registrar: Registrar) : MethodCallHandler {
+class Ijkplayer2Plugin(private val registrar: Registrar) : MethodCallHandler {
 
     override fun onMethodCall(call: MethodCall, result: Result) {
         IjkMediaPlayer.loadLibrariesOnce(null)
-        IjkMediaPlayer.native_profileBegin("libijkplayer.so")
+        IjkMediaPlayer.native_profileBegin("libijkplayer2.so")
         handleMethodCall(call, result)
     }
 
@@ -159,7 +159,7 @@ class IjkplayerPlugin(private val registrar: Registrar) : MethodCallHandler {
         @JvmStatic
         fun registerWith(registrar: Registrar) {
             val channel = MethodChannel(registrar.messenger(), "top.kikt/ijkplayer")
-            channel.setMethodCallHandler(IjkplayerPlugin(registrar))
+            channel.setMethodCallHandler(Ijkplayer2Plugin(registrar))
             manager = IjkManager(registrar)
         }
     }

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_ijkplayer","path":"D:\\\\stable_flutter\\\\works\\\\githubApp\\\\flutter_ijkplayer\\\\","dependencies":[]},{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"android":[{"name":"flutter_ijkplayer","path":"D:\\\\stable_flutter\\\\works\\\\githubApp\\\\flutter_ijkplayer\\\\","dependencies":[]},{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"macos":[{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_ijkplayer","dependencies":[]},{"name":"photo_manager","dependencies":[]}],"date_created":"2020-07-22 15:07:49.635034","version":"1.17.5"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_ijkplayer","path":"D:\\\\stable_flutter\\\\works\\\\githubApp\\\\flutter_ijkplayer\\\\","dependencies":[]},{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"android":[{"name":"flutter_ijkplayer","path":"D:\\\\stable_flutter\\\\works\\\\githubApp\\\\flutter_ijkplayer\\\\","dependencies":[]},{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"macos":[{"name":"photo_manager","path":"D:\\\\stable_flutter\\\\flutter\\\\.pub-cache\\\\git\\\\flutter_photo_manager-4d7c8158dd5a29c97ef349a98d3e33b14b88d9dc\\\\","dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_ijkplayer","dependencies":[]},{"name":"photo_manager","dependencies":[]}],"date_created":"2020-07-22 16:15:26.531495","version":"1.17.5"}