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

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

Issue 1231913003: Add methods to set the ICE connection receiving_timeout values. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Address comments Created 5 years, 5 months 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 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 JOW(void, PeerConnection_setRemoteDescription)( 1472 JOW(void, PeerConnection_setRemoteDescription)(
1473 JNIEnv* jni, jobject j_pc, 1473 JNIEnv* jni, jobject j_pc,
1474 jobject j_observer, jobject j_sdp) { 1474 jobject j_observer, jobject j_sdp) {
1475 rtc::scoped_refptr<SetSdpObserverWrapper> observer( 1475 rtc::scoped_refptr<SetSdpObserverWrapper> observer(
1476 new rtc::RefCountedObject<SetSdpObserverWrapper>( 1476 new rtc::RefCountedObject<SetSdpObserverWrapper>(
1477 jni, j_observer, reinterpret_cast<ConstraintsWrapper*>(NULL))); 1477 jni, j_observer, reinterpret_cast<ConstraintsWrapper*>(NULL)));
1478 ExtractNativePC(jni, j_pc)->SetRemoteDescription( 1478 ExtractNativePC(jni, j_pc)->SetRemoteDescription(
1479 observer, JavaSdpToNativeSdp(jni, j_sdp)); 1479 observer, JavaSdpToNativeSdp(jni, j_sdp));
1480 } 1480 }
1481 1481
1482 JOW(void, PeerConnection_setIceConnectionReceivingTimeout)(JNIEnv* jni,
1483 jobject j_pc,
1484 jint timeout_ms) {
1485 return ExtractNativePC(jni, j_pc)
1486 ->SetIceConnectionReceivingTimeout(timeout_ms);
1487 }
1488
1482 JOW(jboolean, PeerConnection_updateIce)( 1489 JOW(jboolean, PeerConnection_updateIce)(
1483 JNIEnv* jni, jobject j_pc, jobject j_ice_servers, jobject j_constraints) { 1490 JNIEnv* jni, jobject j_pc, jobject j_ice_servers, jobject j_constraints) {
1484 PeerConnectionInterface::IceServers ice_servers; 1491 PeerConnectionInterface::IceServers ice_servers;
1485 JavaIceServersToJsepIceServers(jni, j_ice_servers, &ice_servers); 1492 JavaIceServersToJsepIceServers(jni, j_ice_servers, &ice_servers);
1486 scoped_ptr<ConstraintsWrapper> constraints( 1493 scoped_ptr<ConstraintsWrapper> constraints(
1487 new ConstraintsWrapper(jni, j_constraints)); 1494 new ConstraintsWrapper(jni, j_constraints));
1488 return ExtractNativePC(jni, j_pc)->UpdateIce(ice_servers, constraints.get()); 1495 return ExtractNativePC(jni, j_pc)->UpdateIce(ice_servers, constraints.get());
1489 } 1496 }
1490 1497
1491 JOW(jboolean, PeerConnection_nativeAddIceCandidate)( 1498 JOW(jboolean, PeerConnection_nativeAddIceCandidate)(
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 } 1700 }
1694 1701
1695 JOW(void, VideoTrack_nativeRemoveRenderer)( 1702 JOW(void, VideoTrack_nativeRemoveRenderer)(
1696 JNIEnv* jni, jclass, 1703 JNIEnv* jni, jclass,
1697 jlong j_video_track_pointer, jlong j_renderer_pointer) { 1704 jlong j_video_track_pointer, jlong j_renderer_pointer) {
1698 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer( 1705 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer(
1699 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer)); 1706 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer));
1700 } 1707 }
1701 1708
1702 } // namespace webrtc_jni 1709 } // 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