diff --git a/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/MainActivity.java b/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/MainActivity.java index 5c3ce4f..d0199ef 100644 --- a/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/MainActivity.java +++ b/taoyao-client-android/taoyao/client/src/main/java/com/acgist/taoyao/client/MainActivity.java @@ -182,7 +182,7 @@ public class MainActivity extends AppCompatActivity implements Serializable { } this.threadHandler.post(() -> { // 进入房间 - Taoyao.taoyao.roomEnter("4ca4b920-a422-473d-9954-660df424270f", null); + Taoyao.taoyao.roomEnter("53a5d97d-2860-4659-9531-095bdecf3745", null); // Taoyao.taoyao.sessionCall("taoyao"); }); } diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/include/MediaManager.hpp b/taoyao-client-android/taoyao/media/src/main/cpp/include/MediaManager.hpp index 13410d2..09f7e6c 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/include/MediaManager.hpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/include/MediaManager.hpp @@ -8,4 +8,12 @@ namespace acgist { +#ifndef TAOYAO_JAVA_VM +#define TAOYAO_JAVA_VM + /** + * 全局JavaVM指针 + */ + extern JavaVM* taoyaoJavaVM; +#endif + } \ No newline at end of file diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp b/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp index 187da76..2318b7f 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/include/Room.hpp @@ -7,6 +7,7 @@ #include "sdk/android/native_api/jni/scoped_java_ref.h" #include "Log.hpp" +#include "MediaManager.hpp" #include "RouterCallback.hpp" namespace acgist { @@ -26,7 +27,7 @@ namespace acgist { mediasoupclient::Consumer::Listener* consumerListener; std::map consumers; public: - Room(JavaVM* javaVM, const std::string& roomId, const jobject& routerCallback); + Room(const std::string& roomId, const jobject& routerCallback); virtual ~Room(); public: void enterRoom(JNIEnv* env, const std::string& rtpCapabilities, webrtc::PeerConnectionFactoryInterface* factory, webrtc::PeerConnectionInterface::RTCConfiguration& rtcConfiguration); diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/include/RouterCallback.hpp b/taoyao-client-android/taoyao/media/src/main/cpp/include/RouterCallback.hpp index 2f2c165..9ac74d6 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/include/RouterCallback.hpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/include/RouterCallback.hpp @@ -9,7 +9,6 @@ namespace acgist { class RouterCallback { public: - JavaVM* javaVM; jobject routerCallback; public: void enterRoomCallback(JNIEnv* env, std::string rtpCapabilities, std::string sctpCapabilities); diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/MediaManager.cpp b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/MediaManager.cpp index 38f391e..646eb39 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/MediaManager.cpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/MediaManager.cpp @@ -2,21 +2,19 @@ namespace acgist { + JavaVM* taoyaoJavaVM; + /** * 非常重要 - * 如果没有配置很多方法莫名其妙报错 - * - * @param env JNIEnv */ - void initWebrtcJni(JNIEnv* env) { - JavaVM* javaVM; - env->GetJavaVM(&javaVM); + extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* javaVM, void* reserved) { + taoyaoJavaVM = javaVM; webrtc::jni::InitGlobalJniVariables(javaVM); + return JNI_VERSION_1_6; } extern "C" JNIEXPORT void JNICALL Java_com_acgist_taoyao_media_MediaManager_nativeInit(JNIEnv* env, jobject me) { - initWebrtcJni(env); std::string version = mediasoupclient::Version(); LOG_I("加载MediasoupClient", version.data()); mediasoupclient::Initialize(); diff --git a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp index 0e2b39a..953bee3 100644 --- a/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp +++ b/taoyao-client-android/taoyao/media/src/main/cpp/webrtc/Room.cpp @@ -14,13 +14,22 @@ namespace acgist { public: std::future OnConnect(mediasoupclient::Transport* transport, const nlohmann::json& dtlsParameters) override { - const std::string& cTransportId = transport->GetId(); - std::string cDtlsParameters = dtlsParameters.dump(); + const std::string& cTransportId = transport->GetId(); + const std::string cDtlsParameters = dtlsParameters.dump(); JNIEnv* env; - this->room->javaVM->AttachCurrentThread(&env, nullptr); - this->room->sendTransportConnectCallback(env, cTransportId, cDtlsParameters); - this->room->javaVM->DetachCurrentThread(); - return std::future(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + this->room->sendTransportConnectCallback(env, cTransportId, cDtlsParameters); + } else { + JavaVMAttachArgs args; +// args.version = JNI_VERSION_1_6; +// args.name = "name"; + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, &args); + this->room->sendTransportConnectCallback(env, cTransportId, cDtlsParameters); + taoyaoJavaVM->DetachCurrentThread(); + } + std::promise promise; + promise.set_value(); + return promise.get_future(); } void OnConnectionStateChange(mediasoupclient::Transport* transport, const std::string& connectionState) override { @@ -28,19 +37,26 @@ namespace acgist { } std::future OnProduce(mediasoupclient::SendTransport* transport, const std::string& kind, nlohmann::json rtpParameters, const nlohmann::json& appData) override { - const std::string& cTransportId = transport->GetId(); + const std::string& cTransportId = transport->GetId(); const std::string cRtpParameters = rtpParameters.dump(); JNIEnv* env; - this->room->javaVM->AttachCurrentThread(&env, nullptr); - std::string result = this->room->sendTransportProduceCallback(env, kind, cTransportId, cRtpParameters); - this->room->javaVM->DetachCurrentThread(); + std::string result; + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + result = this->room->sendTransportProduceCallback(env, kind, cTransportId, cRtpParameters); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + result = this->room->sendTransportProduceCallback(env, kind, cTransportId, cRtpParameters); + taoyaoJavaVM->DetachCurrentThread(); + } std::promise promise; promise.set_value(result); return promise.get_future(); } std::future OnProduceData(mediasoupclient::SendTransport* transport, const nlohmann::json& sctpStreamParameters, const std::string& label, const std::string& protocol, const nlohmann::json& appData) override { - return std::future(); + std::promise promise; + // TODO：实现 + return promise.get_future(); } }; @@ -59,10 +75,16 @@ namespace acgist { const std::string& cTransportId = transport->GetId(); const std::string& cDtlsParameters = dtlsParameters.dump(); JNIEnv* env; - this->room->javaVM->AttachCurrentThread(&env, nullptr); - this->room->recvTransportConnectCallback(env, cTransportId, cDtlsParameters); - this->room->javaVM->DetachCurrentThread(); - return std::future(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + this->room->recvTransportConnectCallback(env, cTransportId, cDtlsParameters); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + this->room->recvTransportConnectCallback(env, cTransportId, cDtlsParameters); + taoyaoJavaVM->DetachCurrentThread(); + } + std::promise promise; + promise.set_value(); + return promise.get_future(); } void OnConnectionStateChange(mediasoupclient::Transport* transport, const std::string& connectionState) override { @@ -83,9 +105,13 @@ namespace acgist { void OnTransportClose(mediasoupclient::Producer* producer) override { producer->Close(); JNIEnv* env; - this->room->javaVM->AttachCurrentThread(&env, nullptr); - this->room->producerCloseCallback(env, producer->GetId()); - this->room->javaVM->DetachCurrentThread(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + this->room->producerCloseCallback(env, producer->GetId()); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + this->room->producerCloseCallback(env, producer->GetId()); + taoyaoJavaVM->DetachCurrentThread(); + } } }; @@ -103,24 +129,31 @@ namespace acgist { void OnTransportClose(mediasoupclient::Consumer* consumer) override { consumer->Close(); JNIEnv* env; - this->room->javaVM->AttachCurrentThread(&env, nullptr); - this->room->consumerCloseCallback(env, consumer->GetId()); - this->room->javaVM->DetachCurrentThread(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + this->room->consumerCloseCallback(env, consumer->GetId()); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + this->room->consumerCloseCallback(env, consumer->GetId()); + taoyaoJavaVM->DetachCurrentThread(); + } } }; Room::Room( - JavaVM* javaVM, const std::string& roomId, const jobject& routerCallback ) { - this->roomId = roomId; - this->javaVM = javaVM; this->routerCallback = routerCallback; + this->roomId = roomId; + this->factory = nullptr; this->device = new mediasoupclient::Device(); + this->sendTransport = nullptr; + this->recvTransport = nullptr; this->sendListener = new SendListener(this); this->recvListener = new RecvListener(this); + this->audioProducer = nullptr; + this->videoProducer = nullptr; this->producerListener = new ProducerListener(this); this->consumerListener = new ConsumerListener(this); } @@ -136,10 +169,13 @@ namespace acgist { delete this->producerListener; delete this->consumerListener; JNIEnv* env; - this->javaVM->AttachCurrentThread(&env, nullptr); - env->DeleteLocalRef(this->routerCallback); - env->DeleteGlobalRef(this->routerCallback); - this->javaVM->DetachCurrentThread(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + env->DeleteGlobalRef(this->routerCallback); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + env->DeleteGlobalRef(this->routerCallback); + taoyaoJavaVM->DetachCurrentThread(); + } } void Room::enterRoom( @@ -149,12 +185,11 @@ namespace acgist { webrtc::PeerConnectionInterface::RTCConfiguration& rtcConfiguration ) { this->factory = factory; - nlohmann::json json; // TODO：全局 mediasoupclient::PeerConnection::Options options; options.config = rtcConfiguration; options.factory = factory; - json["routerRtpCapabilities"] = nlohmann::json::parse(rtpCapabilities); + nlohmann::json json = nlohmann::json::parse(rtpCapabilities); this->device->Load(json, &options); const std::string cRtpCapabilities = this->device->GetRtpCapabilities().dump(); const std::string cSctpCapabilities = this->device->GetSctpCapabilities().dump(); @@ -320,8 +355,12 @@ namespace acgist { } void Room::closeRoom() { - this->audioProducer->Close(); - this->videoProducer->Close(); + if(this->audioProducer != nullptr) { + this->audioProducer->Close(); + } + if(this->videoProducer != nullptr) { + this->videoProducer->Close(); + } std::map::iterator iterator; for (iterator = this->consumers.begin(); iterator != this->consumers.end(); iterator++) { iterator->second->Close(); @@ -330,12 +369,20 @@ namespace acgist { // consumer->Close(); // }); this->consumers.clear(); - this->sendTransport->Close(); - this->recvTransport->Close(); + if(this->sendTransport != nullptr) { + this->sendTransport->Close(); + } + if(this->recvTransport != nullptr) { + this->recvTransport->Close(); + } JNIEnv* env; - this->javaVM->AttachCurrentThread(&env, nullptr); - this->closeRoomCallback(env); - this->javaVM->DetachCurrentThread(); + if(taoyaoJavaVM->GetEnv((void**) &env, JNI_VERSION_1_6) == JNI_OK) { + this->closeRoomCallback(env); + } else { + taoyaoJavaVM->AttachCurrentThreadAsDaemon(&env, nullptr); + this->closeRoomCallback(env); + taoyaoJavaVM->DetachCurrentThread(); + } } extern "C" JNIEXPORT jlong JNICALL @@ -343,11 +390,9 @@ namespace acgist { JNIEnv* env, jobject me, jstring jRoomId, jobject jRouterCallback ) { - JavaVM* javaVM; - env->GetJavaVM(&javaVM); jobject routerCallback = env->NewGlobalRef(jRouterCallback); const char* roomId = env->GetStringUTFChars(jRoomId, nullptr); - Room* room = new Room(javaVM, roomId, routerCallback); + Room* room = new Room(roomId, routerCallback); env->DeleteLocalRef(jRoomId); env->ReleaseStringUTFChars(jRoomId, roomId); return (jlong) room; diff --git a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java index 607088d..2a84a5b 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java +++ b/taoyao-client-android/taoyao/media/src/main/java/com/acgist/taoyao/media/MediaManager.java @@ -300,6 +300,7 @@ public final class MediaManager { PeerConnectionFactory.InitializationOptions.builder(this.context) // .setFieldTrials("WebRTC-IntelVP8/Enabled/") // .setFieldTrials("WebRTC-H264HighProfile/Enabled/") + // TODO：测试是否需要c++全局加载JavaVM？ // .setNativeLibraryName("jingle_peerconnection_so") // .setEnableInternalTracer(true) .createInitializationOptions() diff --git a/taoyao-client-web/src/components/Taoyao.js b/taoyao-client-web/src/components/Taoyao.js index ceb1c1d..345a983 100644 --- a/taoyao-client-web/src/components/Taoyao.js +++ b/taoyao-client-web/src/components/Taoyao.js @@ -289,6 +289,9 @@ class Session { if(this.closed) { return; } + if(!candidate || candidate.sdpMid === undefined || candidate.sdpMLineIndex === undefined && candidate.candidate === undefined) { + return; + } if(this.peerConnection) { await this.peerConnection.addIceCandidate(new RTCIceCandidate(candidate)); } else { @@ -2199,9 +2202,6 @@ class Taoyao extends RemoteClient { } else if (type === "answer") { await session.peerConnection.setRemoteDescription(new RTCSessionDescription(message.body)); } else if (type === "candidate") { - if(!candidate || candidate.sdpMid === undefined || candidate.sdpMLineIndex === undefined && candidate.candidate === undefined) { - return; - } await session.addIceCandidate(candidate); } else { } diff --git a/taoyao-signal-server/docs/assembly/dev.xml b/taoyao-signal-server/docs/assembly/dev.xml index c7aaee0..49af35d 100644 --- a/taoyao-signal-server/docs/assembly/dev.xml +++ b/taoyao-signal-server/docs/assembly/dev.xml @@ -37,6 +37,7 @@ src/main/resources config + *.cer *.jks *.p12 *.pfx diff --git a/taoyao-signal-server/docs/assembly/prd.xml b/taoyao-signal-server/docs/assembly/prd.xml index f7077f1..88de6eb 100644 --- a/taoyao-signal-server/docs/assembly/prd.xml +++ b/taoyao-signal-server/docs/assembly/prd.xml @@ -37,6 +37,7 @@ src/main/resources config + *.cer *.jks *.p12 *.pfx diff --git a/taoyao-signal-server/pom.xml b/taoyao-signal-server/pom.xml index 0db026a..3649f95 100644 --- a/taoyao-signal-server/pom.xml +++ b/taoyao-signal-server/pom.xml @@ -175,10 +175,12 @@ + *.cer *.jks *.p12 *.pfx *.yml + *.TTF *.properties