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 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1624 GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id); | 1624 GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id); |
1625 | 1625 |
1626 jfieldID j_ice_candidate_pool_size_id = | 1626 jfieldID j_ice_candidate_pool_size_id = |
1627 GetFieldID(jni, j_rtc_config_class, "iceCandidatePoolSize", "I"); | 1627 GetFieldID(jni, j_rtc_config_class, "iceCandidatePoolSize", "I"); |
1628 jfieldID j_presume_writable_when_fully_relayed_id = GetFieldID( | 1628 jfieldID j_presume_writable_when_fully_relayed_id = GetFieldID( |
1629 jni, j_rtc_config_class, "presumeWritableWhenFullyRelayed", "Z"); | 1629 jni, j_rtc_config_class, "presumeWritableWhenFullyRelayed", "Z"); |
1630 | 1630 |
1631 jfieldID j_prune_turn_ports_id = | 1631 jfieldID j_prune_turn_ports_id = |
1632 GetFieldID(jni, j_rtc_config_class, "pruneTurnPorts", "Z"); | 1632 GetFieldID(jni, j_rtc_config_class, "pruneTurnPorts", "Z"); |
1633 | 1633 |
1634 jfieldID j_redetermine_role_on_ice_restart_id = | |
pthatcher1
2016/08/29 23:27:42
If we're only going to use the switch in Chromium,
honghaiz3
2016/08/29 23:32:27
Done. Removed.
| |
1635 GetFieldID(jni, j_rtc_config_class, "redetermineRoleOnIceRestart", "Z"); | |
1636 | |
1634 rtc_config->type = | 1637 rtc_config->type = |
1635 JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); | 1638 JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); |
1636 rtc_config->bundle_policy = | 1639 rtc_config->bundle_policy = |
1637 JavaBundlePolicyToNativeType(jni, j_bundle_policy); | 1640 JavaBundlePolicyToNativeType(jni, j_bundle_policy); |
1638 rtc_config->rtcp_mux_policy = | 1641 rtc_config->rtcp_mux_policy = |
1639 JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy); | 1642 JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy); |
1640 rtc_config->tcp_candidate_policy = | 1643 rtc_config->tcp_candidate_policy = |
1641 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); | 1644 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); |
1642 rtc_config->candidate_network_policy = | 1645 rtc_config->candidate_network_policy = |
1643 JavaCandidateNetworkPolicyToNativeType(jni, j_candidate_network_policy); | 1646 JavaCandidateNetworkPolicyToNativeType(jni, j_candidate_network_policy); |
1644 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers); | 1647 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers); |
1645 rtc_config->audio_jitter_buffer_max_packets = | 1648 rtc_config->audio_jitter_buffer_max_packets = |
1646 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); | 1649 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); |
1647 rtc_config->audio_jitter_buffer_fast_accelerate = GetBooleanField( | 1650 rtc_config->audio_jitter_buffer_fast_accelerate = GetBooleanField( |
1648 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); | 1651 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); |
1649 rtc_config->ice_connection_receiving_timeout = | 1652 rtc_config->ice_connection_receiving_timeout = |
1650 GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id); | 1653 GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id); |
1651 rtc_config->ice_backup_candidate_pair_ping_interval = GetIntField( | 1654 rtc_config->ice_backup_candidate_pair_ping_interval = GetIntField( |
1652 jni, j_rtc_config, j_ice_backup_candidate_pair_ping_interval_id); | 1655 jni, j_rtc_config, j_ice_backup_candidate_pair_ping_interval_id); |
1653 rtc_config->continual_gathering_policy = | 1656 rtc_config->continual_gathering_policy = |
1654 JavaContinualGatheringPolicyToNativeType( | 1657 JavaContinualGatheringPolicyToNativeType( |
1655 jni, j_continual_gathering_policy); | 1658 jni, j_continual_gathering_policy); |
1656 rtc_config->ice_candidate_pool_size = | 1659 rtc_config->ice_candidate_pool_size = |
1657 GetIntField(jni, j_rtc_config, j_ice_candidate_pool_size_id); | 1660 GetIntField(jni, j_rtc_config, j_ice_candidate_pool_size_id); |
1661 rtc_config->presume_writable_when_fully_relayed = GetBooleanField( | |
1662 jni, j_rtc_config, j_presume_writable_when_fully_relayed_id); | |
1658 rtc_config->prune_turn_ports = | 1663 rtc_config->prune_turn_ports = |
1659 GetBooleanField(jni, j_rtc_config, j_prune_turn_ports_id); | 1664 GetBooleanField(jni, j_rtc_config, j_prune_turn_ports_id); |
1660 rtc_config->presume_writable_when_fully_relayed = GetBooleanField( | 1665 rtc_config->redetermine_role_on_ice_restart = |
1661 jni, j_rtc_config, j_presume_writable_when_fully_relayed_id); | 1666 GetBooleanField(jni, j_rtc_config, j_redetermine_role_on_ice_restart_id); |
1662 } | 1667 } |
1663 | 1668 |
1664 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( | 1669 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( |
1665 JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config, | 1670 JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config, |
1666 jobject j_constraints, jlong observer_p) { | 1671 jobject j_constraints, jlong observer_p) { |
1667 rtc::scoped_refptr<PeerConnectionFactoryInterface> f( | 1672 rtc::scoped_refptr<PeerConnectionFactoryInterface> f( |
1668 reinterpret_cast<PeerConnectionFactoryInterface*>( | 1673 reinterpret_cast<PeerConnectionFactoryInterface*>( |
1669 factoryFromJava(factory))); | 1674 factoryFromJava(factory))); |
1670 | 1675 |
1671 PeerConnectionInterface::RTCConfiguration rtc_config; | 1676 PeerConnectionInterface::RTCConfiguration rtc_config; |
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2349 return JavaStringFromStdString( | 2354 return JavaStringFromStdString( |
2350 jni, | 2355 jni, |
2351 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); | 2356 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); |
2352 } | 2357 } |
2353 | 2358 |
2354 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { | 2359 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { |
2355 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); | 2360 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); |
2356 } | 2361 } |
2357 | 2362 |
2358 } // namespace webrtc_jni | 2363 } // namespace webrtc_jni |
OLD | NEW |