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

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

Issue 1269843005: Added DtlsCertificate, a ref counted object owning an SSLIdentity (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with master Created 5 years, 4 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 1356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1367 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy); 1367 JavaTcpCandidatePolicyToNativeType(jni, j_tcp_candidate_policy);
1368 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config.servers); 1368 JavaIceServersToJsepIceServers(jni, j_ice_servers, &rtc_config.servers);
1369 rtc_config.audio_jitter_buffer_max_packets = 1369 rtc_config.audio_jitter_buffer_max_packets =
1370 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id); 1370 GetIntField(jni, j_rtc_config, j_audio_jitter_buffer_max_packets_id);
1371 rtc_config.audio_jitter_buffer_fast_accelerate = GetBooleanField( 1371 rtc_config.audio_jitter_buffer_fast_accelerate = GetBooleanField(
1372 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id); 1372 jni, j_rtc_config, j_audio_jitter_buffer_fast_accelerate_id);
1373 1373
1374 PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p); 1374 PCOJava* observer = reinterpret_cast<PCOJava*>(observer_p);
1375 observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints)); 1375 observer->SetConstraints(new ConstraintsWrapper(jni, j_constraints));
1376 rtc::scoped_refptr<PeerConnectionInterface> pc(f->CreatePeerConnection( 1376 rtc::scoped_refptr<PeerConnectionInterface> pc(f->CreatePeerConnection(
1377 rtc_config, observer->constraints(), NULL, NULL, observer)); 1377 rtc_config,
1378 observer->constraints(),
1379 nullptr,
1380 rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface>(nullptr).Pass(),
tommi (sloooow) - chröme 2015/08/18 14:49:35 hmm... could you just pass nullptr here?
1381 observer));
1378 return (jlong)pc.release(); 1382 return (jlong)pc.release();
1379 } 1383 }
1380 1384
1381 static rtc::scoped_refptr<PeerConnectionInterface> ExtractNativePC( 1385 static rtc::scoped_refptr<PeerConnectionInterface> ExtractNativePC(
1382 JNIEnv* jni, jobject j_pc) { 1386 JNIEnv* jni, jobject j_pc) {
1383 jfieldID native_pc_id = GetFieldID(jni, 1387 jfieldID native_pc_id = GetFieldID(jni,
1384 GetObjectClass(jni, j_pc), "nativePeerConnection", "J"); 1388 GetObjectClass(jni, j_pc), "nativePeerConnection", "J");
1385 jlong j_p = GetLongField(jni, j_pc, native_pc_id); 1389 jlong j_p = GetLongField(jni, j_pc, native_pc_id);
1386 return rtc::scoped_refptr<PeerConnectionInterface>( 1390 return rtc::scoped_refptr<PeerConnectionInterface>(
1387 reinterpret_cast<PeerConnectionInterface*>(j_p)); 1391 reinterpret_cast<PeerConnectionInterface*>(j_p));
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 } 1711 }
1708 1712
1709 JOW(void, VideoTrack_nativeRemoveRenderer)( 1713 JOW(void, VideoTrack_nativeRemoveRenderer)(
1710 JNIEnv* jni, jclass, 1714 JNIEnv* jni, jclass,
1711 jlong j_video_track_pointer, jlong j_renderer_pointer) { 1715 jlong j_video_track_pointer, jlong j_renderer_pointer) {
1712 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer( 1716 reinterpret_cast<VideoTrackInterface*>(j_video_track_pointer)->RemoveRenderer(
1713 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer)); 1717 reinterpret_cast<VideoRendererInterface*>(j_renderer_pointer));
1714 } 1718 }
1715 1719
1716 } // namespace webrtc_jni 1720 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698