Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: talk/app/webrtc/java/jni/peerconnection_jni.cc

Issue 1455033004: Ping backup connection at a slower rate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge with head Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | talk/app/webrtc/java/src/org/webrtc/PeerConnection.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 1562 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 jobject j_ice_servers = GetObjectField(jni, j_rtc_config, j_ice_servers_id); 1573 jobject j_ice_servers = GetObjectField(jni, j_rtc_config, j_ice_servers_id);
1574 1574
1575 jfieldID j_audio_jitter_buffer_max_packets_id = 1575 jfieldID j_audio_jitter_buffer_max_packets_id =
1576 GetFieldID(jni, j_rtc_config_class, "audioJitterBufferMaxPackets", "I"); 1576 GetFieldID(jni, j_rtc_config_class, "audioJitterBufferMaxPackets", "I");
1577 jfieldID j_audio_jitter_buffer_fast_accelerate_id = GetFieldID( 1577 jfieldID j_audio_jitter_buffer_fast_accelerate_id = GetFieldID(
1578 jni, j_rtc_config_class, "audioJitterBufferFastAccelerate", "Z"); 1578 jni, j_rtc_config_class, "audioJitterBufferFastAccelerate", "Z");
1579 1579
1580 jfieldID j_ice_connection_receiving_timeout_id = 1580 jfieldID j_ice_connection_receiving_timeout_id =
1581 GetFieldID(jni, j_rtc_config_class, "iceConnectionReceivingTimeout", "I"); 1581 GetFieldID(jni, j_rtc_config_class, "iceConnectionReceivingTimeout", "I");
1582 1582
1583 jfieldID j_ice_backup_candidate_pair_ping_interval_id = GetFieldID(
1584 jni, j_rtc_config_class, "iceBackupCandidatePairPingInterval", "I");
1585
1583 jfieldID j_continual_gathering_policy_id = 1586 jfieldID j_continual_gathering_policy_id =
1584 GetFieldID(jni, j_rtc_config_class, "continualGatheringPolicy", 1587 GetFieldID(jni, j_rtc_config_class, "continualGatheringPolicy",
1585 "Lorg/webrtc/PeerConnection$ContinualGatheringPolicy;"); 1588 "Lorg/webrtc/PeerConnection$ContinualGatheringPolicy;");
1586 jobject j_continual_gathering_policy = 1589 jobject j_continual_gathering_policy =
1587 GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id); 1590 GetObjectField(jni, j_rtc_config, j_continual_gathering_policy_id);
1588 1591
1589 rtc_config->type = 1592 rtc_config->type =
1590 JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type); 1593 JavaIceTransportsTypeToNativeType(jni, j_ice_transports_type);
1591 rtc_config->bundle_policy = 1594 rtc_config->bundle_policy =
1592 JavaBundlePolicyToNativeType(jni, j_bundle_policy); 1595 JavaBundlePolicyToNativeType(jni, j_bundle_policy);
1593 rtc_config->rtcp_mux_policy = 1596 rtc_config->rtcp_mux_policy =
1594 JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy); 1597 JavaRtcpMuxPolicyToNativeType(jni, j_rtcp_mux_policy);
1595 rtc_config->tcp_candidate_policy = 1598 rtc_config->tcp_candidate_policy =
1596 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); 1599 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy);
1597 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers); 1600 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config->servers);
1598 rtc_config->audio_jitter_buffer_max_packets = 1601 rtc_config->audio_jitter_buffer_max_packets =
1599 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); 1602 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id);
1600 rtc_config->audio_jitter_buffer_fast_accelerate = GetBooleanField( 1603 rtc_config->audio_jitter_buffer_fast_accelerate = GetBooleanField(
1601 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); 1604 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id);
1602 rtc_config->ice_connection_receiving_timeout = 1605 rtc_config->ice_connection_receiving_timeout =
1603 GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id); 1606 GetIntField(jni, j_rtc_config, j_ice_connection_receiving_timeout_id);
1607 rtc_config->ice_backup_candidate_pair_ping_interval = GetIntField(
1608 jni, j_rtc_config, j_ice_backup_candidate_pair_ping_interval_id);
1604 rtc_config->continual_gathering_policy = 1609 rtc_config->continual_gathering_policy =
1605 JavaContinualGatheringPolicyToNativeType( 1610 JavaContinualGatheringPolicyToNativeType(
1606 jni, j_continual_gathering_policy); 1611 jni, j_continual_gathering_policy);
1607 } 1612 }
1608 1613
1609 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)( 1614 JOW(jlong, PeerConnectionFactory_nativeCreatePeerConnection)(
1610 JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config, 1615 JNIEnv *jni, jclass, jlong factory, jobject j_rtc_config,
1611 jobject j_constraints, jlong observer_p) { 1616 jobject j_constraints, jlong observer_p) {
1612 rtc::scoped_refptr<PeerConnectionFactoryInterface> f( 1617 rtc::scoped_refptr<PeerConnectionFactoryInterface> f(
1613 reinterpret_cast<PeerConnectionFactoryInterface*>( 1618 reinterpret_cast<PeerConnectionFactoryInterface*>(
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 return JavaStringFromStdString( 2151 return JavaStringFromStdString(
2147 jni, 2152 jni,
2148 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2153 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2149 } 2154 }
2150 2155
2151 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2156 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2152 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2157 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2153 } 2158 }
2154 2159
2155 } // namespace webrtc_jni 2160 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « no previous file | talk/app/webrtc/java/src/org/webrtc/PeerConnection.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698