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

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

Issue 1151943005: Ability to specify KeyType (RSA, ECDSA) for SSLIdentity generation in libjingle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressing ASAN, LSAN issues in unittests Created 5 years, 6 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
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 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); 1343 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy);
1344 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config.servers); 1344 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config.servers);
1345 rtc_config.audio_jitter_buffer_max_packets = 1345 rtc_config.audio_jitter_buffer_max_packets =
1346 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); 1346 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id);
1347 rtc_config.audio_jitter_buffer_fast_accelerate = GetBooleanField( 1347 rtc_config.audio_jitter_buffer_fast_accelerate = GetBooleanField(
1348 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); 1348 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id);
1349 1349
1350 PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p); 1350 PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p);
1351 observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints)); 1351 observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints));
1352 rtc::scoped_refptr<PeerConnectionInterface> pc(f->CreatePeerConnection( 1352 rtc::scoped_refptr<PeerConnectionInterface> pc(f->CreatePeerConnection(
1353 rtc_config, observer->constraints(), NULL, NULL, observer)); 1353 rtc_config, observer->constraints(), nullptr, observer, nullptr));
1354 return (jlong)pc.release(); 1354 return (jlong)pc.release();
1355 } 1355 }
1356 1356
1357 static rtc::scoped_refptr<PeerConnectionInterface> ExtractNativePC( 1357 static rtc::scoped_refptr<PeerConnectionInterface> ExtractNativePC(
1358 JNIEnv* jni, jobject j_pc) { 1358 JNIEnv* jni, jobject j_pc) {
1359 jfieldID native_pc_id = GetFieldID(jni, 1359 jfieldID native_pc_id = GetFieldID(jni,
1360 GetObjectClass(jni, j_pc), "nativePeerConnection", "J"); 1360 GetObjectClass(jni, j_pc), "nativePeerConnection", "J");
1361 jlong j_p = GetLongField(jni, j_pc, native_pc_id); 1361 jlong j_p = GetLongField(jni, j_pc, native_pc_id);
1362 return rtc::scoped_refptr<PeerConnectionInterface>( 1362 return rtc::scoped_refptr<PeerConnectionInterface>(
1363 reinterpret_cast<PeerConnectionInterface*>(j_p)); 1363 reinterpret_cast<PeerConnectionInterface*>(j_p));
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 } 1676 }
1677 1677
1678 JOW(void, VideoTrack_nativeRemoveRenderer)( 1678 JOW(void, VideoTrack_nativeRemoveRenderer)(
1679 JNIEnv* jni, jclass, 1679 JNIEnv* jni, jclass,
1680 jlong j_video_track_pointer, jlong j_renderer_pointer) { 1680 jlong j_video_track_pointer, jlong j_renderer_pointer) {
1681 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer( 1681 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer(
1682 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer)); 1682 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer));
1683 } 1683 }
1684 1684
1685 } // namespace webrtc_jni 1685 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698