qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 每日优化

Browse Source
This commit is contained in:
acgist
2023-05-19 07:54:31 +08:00
parent ae3e2527ed
commit 496c875b22
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Deploy.md
View File

@@ -326,6 +326,7 @@ vi /etc/ld.so.conf
--- ---
/usr/local/lib/ /usr/local/lib/
/usr/local/lib64/
--- ---
ldconfig ldconfig

51
taoyao-client-android/taoyao/media/src/main/cpp/webrtc/RouterCallback.cpp
View File

@@ -20,12 +20,12 @@ namespace acgist {
} }
void RouterCallback::enterRoomCallback(JNIEnv* env, const std::string& rtpCapabilities, const std::string& sctpCapabilities) { void RouterCallback::enterRoomCallback(JNIEnv* env, const std::string& rtpCapabilities, const std::string& sctpCapabilities) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID recvTransportConnectCallback = env->GetMethodID(jCallbackClazz, "enterRoomCallback", "(Ljava/lang/String;Ljava/lang/String;)V"); jmethodID recvTransportConnectCallback = env->GetMethodID(jCallbackClazz, "enterRoomCallback", "(Ljava/lang/String;Ljava/lang/String;)V");
const char* cRtpCapabilities = rtpCapabilities.data(); const char* cRtpCapabilities = rtpCapabilities.data();
const char* cSctpCapabilities = sctpCapabilities.data(); const char* cSctpCapabilities = sctpCapabilities.data();
jstring jRtpCapabilities = env->NewStringUTF(cRtpCapabilities); jstring jRtpCapabilities = env->NewStringUTF(cRtpCapabilities);
jstring jScrpCapabilities = env->NewStringUTF(cSctpCapabilities); jstring jScrpCapabilities = env->NewStringUTF(cSctpCapabilities);
env->CallVoidMethod( env->CallVoidMethod(
this->routerCallback, this->routerCallback,
recvTransportConnectCallback, recvTransportConnectCallback,
@@ -38,7 +38,7 @@ namespace acgist {
} }
void RouterCallback::closeRoomCallback(JNIEnv* env) { void RouterCallback::closeRoomCallback(JNIEnv* env) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID closeRoomCallback = env->GetMethodID(jCallbackClazz, "closeRoomCallback", "()V"); jmethodID closeRoomCallback = env->GetMethodID(jCallbackClazz, "closeRoomCallback", "()V");
env->CallVoidMethod( env->CallVoidMethod(
this->routerCallback, this->routerCallback,
@@ -48,12 +48,12 @@ namespace acgist {
} }
void RouterCallback::sendTransportConnectCallback(JNIEnv* env, const std::string& transportId, const std::string& dtlsParameters) { void RouterCallback::sendTransportConnectCallback(JNIEnv* env, const std::string& transportId, const std::string& dtlsParameters) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID sendTransportConnectCallback = env->GetMethodID(jCallbackClazz, "sendTransportConnectCallback", "(Ljava/lang/String;Ljava/lang/String;)V"); jmethodID sendTransportConnectCallback = env->GetMethodID(jCallbackClazz, "sendTransportConnectCallback", "(Ljava/lang/String;Ljava/lang/String;)V");
const char* cTransportId = transportId.data(); const char* cTransportId = transportId.data();
const char* cDtlsParameters = dtlsParameters.data(); const char* cDtlsParameters = dtlsParameters.data();
jstring jTransportId = env->NewStringUTF(cTransportId); jstring jTransportId = env->NewStringUTF(cTransportId);
jstring jDtlsParameters = env->NewStringUTF(cDtlsParameters); jstring jDtlsParameters = env->NewStringUTF(cDtlsParameters);
env->CallVoidMethod( env->CallVoidMethod(
this->routerCallback, this->routerCallback,
sendTransportConnectCallback, sendTransportConnectCallback,
@@ -66,12 +66,12 @@ namespace acgist {
} }
void RouterCallback::recvTransportConnectCallback(JNIEnv* env, const std::string& transportId, const std::string& dtlsParameters) { void RouterCallback::recvTransportConnectCallback(JNIEnv* env, const std::string& transportId, const std::string& dtlsParameters) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID recvTransportConnectCallback = env->GetMethodID(jCallbackClazz, "recvTransportConnectCallback", "(Ljava/lang/String;Ljava/lang/String;)V"); jmethodID recvTransportConnectCallback = env->GetMethodID(jCallbackClazz, "recvTransportConnectCallback", "(Ljava/lang/String;Ljava/lang/String;)V");
const char* cTransportId = transportId.data(); const char* cTransportId = transportId.data();
const char* cDtlsParameters = dtlsParameters.data(); const char* cDtlsParameters = dtlsParameters.data();
jstring jTransportId = env->NewStringUTF(cTransportId); jstring jTransportId = env->NewStringUTF(cTransportId);
jstring jDtlsParameters = env->NewStringUTF(cDtlsParameters); jstring jDtlsParameters = env->NewStringUTF(cDtlsParameters);
env->CallVoidMethod( env->CallVoidMethod(
this->routerCallback, this->routerCallback,
recvTransportConnectCallback, recvTransportConnectCallback,
@@ -84,7 +84,7 @@ namespace acgist {
} }
std::string RouterCallback::sendTransportProduceCallback(JNIEnv* env, const std::string& kind, const std::string& transportId, const std::string& rtpParameters) { std::string RouterCallback::sendTransportProduceCallback(JNIEnv* env, const std::string& kind, const std::string& transportId, const std::string& rtpParameters) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID sendTransportProduceCallback = env->GetMethodID(jCallbackClazz, "sendTransportProduceCallback", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"); jmethodID sendTransportProduceCallback = env->GetMethodID(jCallbackClazz, "sendTransportProduceCallback", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;");
const char* cKind = kind.data(); const char* cKind = kind.data();
const char* cTransportId = transportId.data(); const char* cTransportId = transportId.data();
@@ -105,7 +105,8 @@ namespace acgist {
} }
const char* result = env->GetStringUTFChars(jResult, nullptr); const char* result = env->GetStringUTFChars(jResult, nullptr);
env->DeleteLocalRef(jResult); env->DeleteLocalRef(jResult);
// env->ReleaseStringUTFChars(jResult, result); // TODO：为什么不能释放
// env->ReleaseStringUTFChars(jResult, result);
env->DeleteLocalRef(jKind); env->DeleteLocalRef(jKind);
env->DeleteLocalRef(jTransportId); env->DeleteLocalRef(jTransportId);
env->DeleteLocalRef(jRtpParameters); env->DeleteLocalRef(jRtpParameters);
@@ -114,10 +115,10 @@ namespace acgist {
} }
void RouterCallback::producerNewCallback(JNIEnv* env, const std::string& kind, const std::string& producerId, mediasoupclient::Producer* producerPointer, webrtc::MediaStreamTrackInterface* producerMediaTrackPointer) { void RouterCallback::producerNewCallback(JNIEnv* env, const std::string& kind, const std::string& producerId, mediasoupclient::Producer* producerPointer, webrtc::MediaStreamTrackInterface* producerMediaTrackPointer) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID producerNewCallback = env->GetMethodID(jCallbackClazz, "producerNewCallback", "(Ljava/lang/String;Ljava/lang/String;JJ)V"); jmethodID producerNewCallback = env->GetMethodID(jCallbackClazz, "producerNewCallback", "(Ljava/lang/String;Ljava/lang/String;JJ)V");
const char* cKind = kind.data(); const char* cKind = kind.data();
jstring jKind = env->NewStringUTF(cKind); jstring jKind = env->NewStringUTF(cKind);
const char* cProducerId = producerId.data(); const char* cProducerId = producerId.data();
jstring jProducerId = env->NewStringUTF(cProducerId); jstring jProducerId = env->NewStringUTF(cProducerId);
env->CallVoidMethod( env->CallVoidMethod(
@@ -133,14 +134,17 @@ namespace acgist {
env->DeleteLocalRef(jCallbackClazz); env->DeleteLocalRef(jCallbackClazz);
} }
void RouterCallback::producerCloseCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::producerCloseCallback(JNIEnv* env, const std::string& producerId) {
}
void RouterCallback::producerPauseCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::producerPauseCallback(JNIEnv* env, const std::string& producerId) {
}
void RouterCallback::producerResumeCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::producerResumeCallback(JNIEnv* env, const std::string& producerId) {
}
void RouterCallback::consumerNewCallback(JNIEnv* env, const std::string& message, mediasoupclient::Consumer* consumerPointer, webrtc::MediaStreamTrackInterface* consumerMediaTrackPointer) { void RouterCallback::consumerNewCallback(JNIEnv* env, const std::string& message, mediasoupclient::Consumer* consumerPointer, webrtc::MediaStreamTrackInterface* consumerMediaTrackPointer) {
jclass jCallbackClazz = env->GetObjectClass(this->routerCallback); jclass jCallbackClazz = env->GetObjectClass(this->routerCallback);
jmethodID consumerNewCallback = env->GetMethodID(jCallbackClazz, "consumerNewCallback", "(Ljava/lang/String;JJ)V"); jmethodID consumerNewCallback = env->GetMethodID(jCallbackClazz, "consumerNewCallback", "(Ljava/lang/String;JJ)V");
const char* cMessage = message.data(); const char* cMessage = message.data();
jstring jMessage = env->NewStringUTF(cMessage); jstring jMessage = env->NewStringUTF(cMessage);
@@ -155,10 +159,13 @@ namespace acgist {
env->DeleteLocalRef(jCallbackClazz); env->DeleteLocalRef(jCallbackClazz);
} }
void RouterCallback::consumerCloseCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::consumerCloseCallback(JNIEnv* env, const std::string& producerId) {
}
void RouterCallback::consumerPauseCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::consumerPauseCallback(JNIEnv* env, const std::string& producerId) {
}
void RouterCallback::consumerResumeCallback(JNIEnv* env, const std::string& producerId) {} void RouterCallback::consumerResumeCallback(JNIEnv* env, const std::string& producerId) {
}
} }