ijkplayer: rename ijkio androidio

ijkmedia/ijkplayer/android/ijkplayer_jni.c

@@ -30,7 +30,7 @@
 #include "j4a/class/android/os/Bundle.h"
 #include "j4a/class/tv/danmaku/ijk/media/player/IjkMediaPlayer.h"
 #include "j4a/class/tv/danmaku/ijk/media/player/misc/IMediaDataSource.h"
-#include "j4a/class/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.h"
+#include "j4a/class/tv/danmaku/ijk/media/player/misc/IAndroidIO.h"
 #include "ijksdl/ijksdl_log.h"
 #include "../ff_ffplay.h"
 #include "ffmpeg_api_jni.h"
@@ -120,30 +120,31 @@ fail:
     return nativeMediaDataSource;
 }
 
-static int64_t jni_set_ijkio_http(JNIEnv* env, jobject thiz, jobject ijk_io)
+static int64_t jni_set_ijkio_androidio(JNIEnv* env, jobject thiz, jobject ijk_io)
 {
-    int64_t nativeIjkIOHttp = 0;
+    int64_t nativeAndroidIO = 0;
 
     pthread_mutex_lock(&g_clazz.mutex);
 
-    jobject old = (jobject) (intptr_t) J4AC_IjkMediaPlayer__mNativeIjkIOHttp__get__catchAll(env, thiz);
+    jobject old = (jobject) (intptr_t) J4AC_IjkMediaPlayer__mNativeAndroidIO__get__catchAll(env, thiz);
     if (old) {
-        J4AC_IIjkIOHttp__close__catchAll(env, old);
+        J4AC_IAndroidIO__close__catchAll(env, old);
         J4A_DeleteGlobalRef__p(env, &old);
-        J4AC_IjkMediaPlayer__mNativeIjkIOHttp__set__catchAll(env, thiz, 0);
+        J4AC_IjkMediaPlayer__mNativeAndroidIO__set__catchAll(env, thiz, 0);
     }
 
     if (ijk_io) {
-        jobject global_ijkio_http = (*env)->NewGlobalRef(env, ijk_io);
-        if (J4A_ExceptionCheck__catchAll(env) || !global_ijkio_http)
+        jobject global_ijkio_androidio = (*env)->NewGlobalRef(env, ijk_io);
+        if (J4A_ExceptionCheck__catchAll(env) || !global_ijkio_androidio)
             goto fail;
-        nativeIjkIOHttp = (int64_t) (intptr_t) global_ijkio_http;
-        J4AC_IjkMediaPlayer__mNativeIjkIOHttp__set__catchAll(env, thiz, (jlong) nativeIjkIOHttp);
+
+        nativeAndroidIO = (int64_t) (intptr_t) global_ijkio_androidio;
+        J4AC_IjkMediaPlayer__mNativeAndroidIO__set__catchAll(env, thiz, (jlong) nativeAndroidIO);
     }
 
 fail:
     pthread_mutex_unlock(&g_clazz.mutex);
-    return nativeIjkIOHttp;
+    return nativeAndroidIO;
 }
 
 static int message_loop(void *arg);
@@ -222,21 +223,21 @@ LABEL_RETURN:
 }
 
 static void
-IjkMediaPlayer_setDataSourceIjkIOHttpCallback(JNIEnv *env, jobject thiz, jobject callback) {
+IjkMediaPlayer_setDataSourceAndroidIOCallback(JNIEnv *env, jobject thiz, jobject callback) {
     MPTRACE("%s\n", __func__);
     int retval = 0;
     char uri[128];
-    int64_t nativeIjkIOHttp = 0;
+    int64_t nativeAndroidIO = 0;
 
     IjkMediaPlayer *mp = jni_get_media_player(env, thiz);
     JNI_CHECK_GOTO(callback, env, "java/lang/IllegalArgumentException", "mpjni: setDataSourceIjkIOCallback: null fd", LABEL_RETURN);
     JNI_CHECK_GOTO(mp, env, "java/lang/IllegalStateException", "mpjni: setDataSourceIjkIOCallback: null mp", LABEL_RETURN);
 
-    nativeIjkIOHttp = jni_set_ijkio_http(env, thiz, callback);
-    JNI_CHECK_GOTO(nativeIjkIOHttp, env, "java/lang/IllegalStateException", "mpjni: jni_set_ijkio_http: NewGlobalRef", LABEL_RETURN);
+    nativeAndroidIO = jni_set_ijkio_androidio(env, thiz, callback);
+    JNI_CHECK_GOTO(nativeAndroidIO, env, "java/lang/IllegalStateException", "mpjni: jni_set_ijkio_androidio: NewGlobalRef", LABEL_RETURN);
 
-    ALOGV("setDataSourceIjkIOHttpCallback: %"PRId64"\n", nativeIjkIOHttp);
-    snprintf(uri, sizeof(uri), "ijkio:http:%"PRId64, nativeIjkIOHttp);
+    ALOGV("setDataSourceAndroidIOCallback: %"PRId64"\n", nativeAndroidIO);
+    snprintf(uri, sizeof(uri), "ijkio:androidio:%"PRId64, nativeAndroidIO);
 
     retval = ijkmp_set_data_source(mp, uri);
 
@@ -1081,7 +1082,7 @@ static JNINativeMethod g_methods[] = {
     },
     { "_setDataSourceFd",       "(I)V",     (void *) IjkMediaPlayer_setDataSourceFd },
     { "_setDataSource",         "(Ltv/danmaku/ijk/media/player/misc/IMediaDataSource;)V", (void *)IjkMediaPlayer_setDataSourceCallback },
-    { "_setDataSourceIjkIOHttp",    "(Ltv/danmaku/ijk/media/player/misc/IIjkIOHttp;)V", (void *)IjkMediaPlayer_setDataSourceIjkIOHttpCallback },
+    { "_setDataSourceAndroidIO",    "(Ltv/danmaku/ijk/media/player/misc/IAndroidIO;)V", (void *)IjkMediaPlayer_setDataSourceAndroidIOCallback },
 
     { "_setVideoSurface",       "(Landroid/view/Surface;)V", (void *) IjkMediaPlayer_setVideoSurface },
     { "_prepareAsync",          "()V",      (void *) IjkMediaPlayer_prepareAsync },

ijkmedia/ijkplayer/ijkavformat/ijkioandroidio.c

@@ -29,7 +29,7 @@
 #include "ijkplayer/ijkavutil/opt.h"
 #include "ijkplayer/ijkavutil/ijkutils.h"
 
-#include "j4a/class/tv/danmaku/ijk/media/player/misc/IIjkIOHttp.h"
+#include "j4a/class/tv/danmaku/ijk/media/player/misc/IAndroidIO.h"
 #include "ijksdl/android/ijksdl_android_jni.h"
 #include <assert.h>
 
@@ -49,7 +49,7 @@ static int ijkio_androidio_open(IjkURLContext *h, const char *url, int flags, Ij
     if (!c)
         return -1;
 
-    av_strstart(url, "androidio:http:", &url);
+    av_strstart(url, "androidio:", &url);
 
     ijkio_http = (jobject) (intptr_t) strtoll(url, &final, 10);
     if (!ijkio_http)
@@ -60,7 +60,7 @@ static int ijkio_androidio_open(IjkURLContext *h, const char *url, int flags, Ij
         return AVERROR(EINVAL);
     }
 
-    jint ret = J4AC_IIjkIOHttp__open(env, ijkio_http);
+    jint ret = J4AC_IAndroidIO__open(env, ijkio_http);
     if (J4A_ExceptionCheck__catchAll(env)) {
         return AVERROR(EINVAL);
     } else if (ret < 0) {
@@ -116,7 +116,7 @@ static int ijkio_androidio_read(IjkURLContext *h, unsigned char *buf, int size)
     if (!jbuffer)
         return AVERROR(ENOMEM);
 
-    ret = J4AC_IIjkIOHttp__read(env, c->ijkio_http, jbuffer, size);
+    ret = J4AC_IAndroidIO__read(env, c->ijkio_http, jbuffer, size);
     if (J4A_ExceptionCheck__catchAll(env))
         return AVERROR(EIO);
     else if (ret < 0)
@@ -144,7 +144,7 @@ static int64_t ijkio_androidio_seek(IjkURLContext *h, int64_t offset, int whence
         return AVERROR(EINVAL);
     }
 
-    ret = J4AC_IIjkIOHttp__seek(env, c->ijkio_http, offset, whence);
+    ret = J4AC_IAndroidIO__seek(env, c->ijkio_http, offset, whence);
     if (J4A_ExceptionCheck__catchAll(env))
         return AVERROR(EIO);
 
@@ -166,7 +166,7 @@ static int ijkio_androidio_close(IjkURLContext *h) {
     J4A_DeleteGlobalRef__p(env, &c->jbuffer);
 
     if (c->ijkio_http) {
-        J4AC_IIjkIOHttp__close__catchAll(env, c->ijkio_http);
+        J4AC_IAndroidIO__close__catchAll(env, c->ijkio_http);
         J4A_DeleteGlobalRef__p(env, &c->ijkio_http);
     }
 

ijkmedia/ijkplayer/ijkavformat/ijkioprotocol.c

@@ -44,7 +44,7 @@ int ijkio_alloc_url(IjkURLContext **ph, const char *url) {
         h->priv_data = calloc(1, ijkio_ffio_protocol.priv_data_size);
     }
 #ifdef __ANDROID__
-      else if (!strncmp(url, "android:", strlen("android:"))) {
+      else if (!strncmp(url, "androidio:", strlen("androidio:"))) {
         h = (IjkURLContext *)calloc(1, sizeof(IjkURLContext));
         h->prot = &ijkio_androidio_protocol;
         h->priv_data = calloc(1, ijkio_androidio_protocol.priv_data_size);