OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1518 return PeerConnectionInterface::GATHER_ONCE; | 1518 return PeerConnectionInterface::GATHER_ONCE; |
1519 | 1519 |
1520 if (enum_name == "GATHER_CONTINUALLY") | 1520 if (enum_name == "GATHER_CONTINUALLY") |
1521 return PeerConnectionInterface::GATHER_CONTINUALLY; | 1521 return PeerConnectionInterface::GATHER_CONTINUALLY; |
1522 | 1522 |
1523 RTC_CHECK(false) << "Unexpected ContinualGatheringPolicy enum name " | 1523 RTC_CHECK(false) << "Unexpected ContinualGatheringPolicy enum name " |
1524 << enum_name; | 1524 << enum_name; |
1525 return PeerConnectionInterface::GATHER_ONCE; | 1525 return PeerConnectionInterface::GATHER_ONCE; |
1526 } | 1526 } |
1527 | 1527 |
1528 static PeerConnectionInterface::TlsCertificatePolicy | |
1529 JavaTlsCertificatePolicyTypeToNativeType(JNIEnv* jni, | |
1530 jobject j_ice_server_tls_cert_policy) { | |
1531 std::string enum_name = | |
1532 GetJavaEnumName(jni, "org/webrtc/PeerConnection$TlsCertificatePolicy", | |
1533 j_ice_server_tls_cert_policy); | |
1534 | |
1535 if (enum_name == "TLS_CERT_POLICY_SECURE") | |
1536 return PeerConnectionInterface::kTlsCertPolicySecure; | |
1537 | |
1538 if (enum_name == "TLS_CERT_POLICY_INSECURE_NO_CHECK") | |
1539 return PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck; | |
1540 | |
1541 RTC_CHECK(false) << "Unexpected TlsCertificatePolicy enum_name " << enum_name; | |
1542 return PeerConnectionInterface::kTlsCertPolicySecure; | |
1543 } | |
1544 | |
1528 static void JavaIceServersToJsepIceServers( | 1545 static void JavaIceServersToJsepIceServers( |
1529 JNIEnv* jni, jobject j_ice_servers, | 1546 JNIEnv* jni, jobject j_ice_servers, |
1530 PeerConnectionInterface::IceServers* ice_servers) { | 1547 PeerConnectionInterface::IceServers* ice_servers) { |
1531 for (jobject j_ice_server : Iterable(jni, j_ice_servers)) { | 1548 for (jobject j_ice_server : Iterable(jni, j_ice_servers)) { |
1532 jclass j_ice_server_class = GetObjectClass(jni, j_ice_server); | 1549 jclass j_ice_server_class = GetObjectClass(jni, j_ice_server); |
1533 jfieldID j_ice_server_uri_id = | 1550 jfieldID j_ice_server_uri_id = |
1534 GetFieldID(jni, j_ice_server_class, "uri", "Ljava/lang/String;"); | 1551 GetFieldID(jni, j_ice_server_class, "uri", "Ljava/lang/String;"); |
1535 jfieldID j_ice_server_username_id = | 1552 jfieldID j_ice_server_username_id = |
1536 GetFieldID(jni, j_ice_server_class, "username", "Ljava/lang/String;"); | 1553 GetFieldID(jni, j_ice_server_class, "username", "Ljava/lang/String;"); |
1537 jfieldID j_ice_server_password_id = | 1554 jfieldID j_ice_server_password_id = |
1538 GetFieldID(jni, j_ice_server_class, "password", "Ljava/lang/String;"); | 1555 GetFieldID(jni, j_ice_server_class, "password", "Ljava/lang/String;"); |
1556 jfieldID j_ice_server_tls_cert_policy_id = | |
1557 GetFieldID(jni, j_ice_server_class, "tlsCertificatePolicy", | |
1558 "Lorg/webrtc/PeerConnection$TlsCertificatePolicy;"); | |
1559 jobject j_ice_server_tls_cert_policy = | |
1560 GetObjectField(jni, j_ice_server, j_ice_server_tls_cert_policy_id); | |
1539 jstring uri = reinterpret_cast<jstring>( | 1561 jstring uri = reinterpret_cast<jstring>( |
1540 GetObjectField(jni, j_ice_server, j_ice_server_uri_id)); | 1562 GetObjectField(jni, j_ice_server, j_ice_server_uri_id)); |
1541 jstring username = reinterpret_cast<jstring>( | 1563 jstring username = reinterpret_cast<jstring>( |
1542 GetObjectField(jni, j_ice_server, j_ice_server_username_id)); | 1564 GetObjectField(jni, j_ice_server, j_ice_server_username_id)); |
1543 jstring password = reinterpret_cast<jstring>( | 1565 jstring password = reinterpret_cast<jstring>( |
1544 GetObjectField(jni, j_ice_server, j_ice_server_password_id)); | 1566 GetObjectField(jni, j_ice_server, j_ice_server_password_id)); |
1567 PeerConnectionInterface::TlsCertificatePolicy tls_certificate_policy = | |
1568 JavaTlsCertificatePolicyTypeToNativeType(jni, | |
1569 j_ice_server_tls_cert_policy); | |
1545 PeerConnectionInterface::IceServer server; | 1570 PeerConnectionInterface::IceServer server; |
1546 server.uri = JavaToStdString(jni, uri); | 1571 server.uri = JavaToStdString(jni, uri); |
1547 server.username = JavaToStdString(jni, username); | 1572 server.username = JavaToStdString(jni, username); |
1548 server.password = JavaToStdString(jni, password); | 1573 server.password = JavaToStdString(jni, password); |
1574 server.tls_certificate_policy = tls_certificate_policy; | |
pthatcher1
2016/12/07 21:29:36
If my idea works, you shouldn't any of this new Ja
hnsl1
2016/12/12 16:08:13
Acknowledged.
| |
1549 ice_servers->push_back(server); | 1575 ice_servers->push_back(server); |
1550 } | 1576 } |
1551 } | 1577 } |
1552 | 1578 |
1553 static void JavaRTCConfigurationToJsepRTCConfiguration( | 1579 static void JavaRTCConfigurationToJsepRTCConfiguration( |
1554 JNIEnv* jni, | 1580 JNIEnv* jni, |
1555 jobject j_rtc_config, | 1581 jobject j_rtc_config, |
1556 PeerConnectionInterface::RTCConfiguration* rtc_config) { | 1582 PeerConnectionInterface::RTCConfiguration* rtc_config) { |
1557 jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config); | 1583 jclass j_rtc_config_class = GetObjectClass(jni, j_rtc_config); |
1558 | 1584 |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2405 return JavaStringFromStdString( | 2431 return JavaStringFromStdString( |
2406 jni, | 2432 jni, |
2407 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2433 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
2408 } | 2434 } |
2409 | 2435 |
2410 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2436 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
2411 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2437 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
2412 } | 2438 } |
2413 | 2439 |
2414 } // namespace webrtc_jni | 2440 } // namespace webrtc_jni |
OLD | NEW |