feat(android): add probe by name

alibaba · Aug 4, 2020 · 95c2ad9 · 95c2ad9
1 parent 150381d
commit 95c2ad9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
diff --git a/...ExternalPlayerExoLibrary/src/main/java/com/aliyun/externalplayer/exo/ExternPlayerExo.java b/...ExternalPlayerExoLibrary/src/main/java/com/aliyun/externalplayer/exo/ExternPlayerExo.java
@@ -315,7 +315,16 @@ private void changePlayState(PlayerStatus newState) {
 
     @Override
     public boolean isSupport(Options options) {
-        return true;
+        if (options == null) {
+            return false;
+        }
+
+        String name = options.get("name");
+        if ("ExoPlayer".equals(name)) {
+            return true;
+        }
+
+        return false;
     }
 
     @Override

diff --git a/...urce/premierlibrary/src/main/java/com/cicada/player/nativeclass/NativeExternalPlayer.java b/...urce/premierlibrary/src/main/java/com/cicada/player/nativeclass/NativeExternalPlayer.java
@@ -20,15 +20,12 @@ public class NativeExternalPlayer {
 
     @NativeUsed
     public static boolean isSupport(Options options) {
-        //TODO 根据option判断
-//        CicadaExternalPlayer dummyPlayer = CicadaExternalPlayer.isSupportExternal(options);
-//        if (dummyPlayer != null) {
-//            return true;
-//        } else {
-//            return false;
-//        }
-
-        return true;
+        CicadaExternalPlayer dummyPlayer = CicadaExternalPlayer.isSupportExternal(options);
+        if (dummyPlayer != null) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @NativeUsed

diff --git a/platform/Android/source/premierlibrary/src/main/jni/player/JavaExternalPlayer.cpp b/platform/Android/source/premierlibrary/src/main/jni/player/JavaExternalPlayer.cpp
@@ -374,11 +374,13 @@ bool JavaExternalPlayer::is_supported(const Cicada::options *opts) {
     jobject jOption = JavaOptions::convertTo(mEnv, const_cast<Cicada::options *>(opts));
     jboolean ret = mEnv->CallStaticBooleanMethod(gj_NativeExternalPlayer_Class,
                                                  gj_NativeExternalPlayer_isSupport, jOption);
-    mEnv->DeleteLocalRef(jOption);
+    if(jOption != nullptr) {
+        mEnv->DeleteLocalRef(jOption);
+    }
     return (bool) ret;
 }
 
-JavaExternalPlayer::JavaExternalPlayer() {
+JavaExternalPlayer::JavaExternalPlayer(const Cicada::options * opts) {
     JniEnv Jenv;
     JNIEnv *mEnv = Jenv.getEnv();
 
@@ -391,9 +393,11 @@ JavaExternalPlayer::JavaExternalPlayer() {
     jExternalPlayer = mEnv->NewGlobalRef(tmpPlayer);
     mEnv->DeleteLocalRef(tmpPlayer);
 
-    //TODO  参数设置
-//    jobject jOption = JavaOptions::convertTo(mEnv ,  );
-    mEnv->CallVoidMethod(jExternalPlayer, gj_NativeExternalPlayer_create, (long) this, nullptr);
+    jobject jOption = JavaOptions::convertTo(mEnv , const_cast<Cicada::options *>(opts));
+    mEnv->CallVoidMethod(jExternalPlayer, gj_NativeExternalPlayer_create, (long) this, jOption);
+    if(jOption != nullptr) {
+        mEnv->DeleteLocalRef(jOption);
+    }
 }
 
 JavaExternalPlayer::~JavaExternalPlayer() {

diff --git a/platform/Android/source/premierlibrary/src/main/jni/player/JavaExternalPlayer.h b/platform/Android/source/premierlibrary/src/main/jni/player/JavaExternalPlayer.h
@@ -87,7 +87,7 @@ public :
 
 
 public:
-    JavaExternalPlayer();
+    JavaExternalPlayer(const Cicada::options * opts);
 
     ~JavaExternalPlayer() override;
 
@@ -217,25 +217,20 @@ public :
 
 private:
     ICicadaPlayer *clone() override {
-        return new JavaExternalPlayer();
+        return new JavaExternalPlayer(options);
     }
 
     explicit JavaExternalPlayer(int dummy) {
         addPrototype(this);
     }
 
     int probeScore(const Cicada::options *opts) override {
-        if (opts) {
-            string name = opts->get("name");
-            if (!name.empty()) {
-                if (name == "JavaExternalPlayer") {
-                    return Cicada::SUPPORT_MAX;
-                } else {
-                    return Cicada::SUPPORT_NOT;
-                }
-            }
+        options = opts;
+        if (is_supported(opts)) {
+            return Cicada::SUPPORT_MAX;
+        } else {
+            return Cicada::SUPPORT_NOT;
         }
-        return Cicada::SUPPORT_NOT;
     }
 
     static JavaExternalPlayer se;
@@ -274,7 +269,7 @@ public :
     playerListener mPlayerListener{};
     StreamInfo ** mStreamInfos{nullptr};
     int mStreamCount{0};
-
+    const Cicada::options *options{nullptr};
 private:
     void releaseStreamInfo(StreamInfo *pInfo);
 

diff --git a/platform/Android/source/premierlibrary/src/main/jni/player/JavaOptions.cpp b/platform/Android/source/premierlibrary/src/main/jni/player/JavaOptions.cpp
@@ -23,7 +23,7 @@ void JavaOptions::init(JNIEnv *env) {
                                            "()V");
         gj_Options_set = env->GetMethodID(gj_Options_Class,
                                           "set",
-                                          "(Ljava/lang/String;Ljava/lang/String;I)V");
+                                          "(Ljava/lang/String;Ljava/lang/String;I)Z");
 
     }
 }
@@ -47,7 +47,7 @@ jobject JavaOptions::convertTo(JNIEnv *pEnv, Cicada::options *options) {
     for (auto &opt : opts) {
         NewStringUTF key(pEnv, opt.first.c_str());
         NewStringUTF value(pEnv, opt.second.c_str());
-        pEnv->CallVoidMethod(jOptions, gj_Options_set, key.getString(), value.getString(), 1);
+        pEnv->CallBooleanMethod(jOptions, gj_Options_set, key.getString(), value.getString(), 1);
     }
 
     return jOptions;