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

Side by Side Diff: webrtc/api/android/jni/peerconnection_jni.cc

Issue 2128483002: Fix for the JNI interface of RtcEventLog functions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 | « webrtc/api/android/java/src/org/webrtc/PeerConnection.java ('k') | no next file » | 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 * 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 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 return factory->StartAecDump(file, filesize_limit_bytes); 1312 return factory->StartAecDump(file, filesize_limit_bytes);
1313 } 1313 }
1314 1314
1315 JOW(void, PeerConnectionFactory_nativeStopAecDump)( 1315 JOW(void, PeerConnectionFactory_nativeStopAecDump)(
1316 JNIEnv* jni, jclass, jlong native_factory) { 1316 JNIEnv* jni, jclass, jlong native_factory) {
1317 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1317 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1318 factoryFromJava(native_factory)); 1318 factoryFromJava(native_factory));
1319 factory->StopAecDump(); 1319 factory->StopAecDump();
1320 } 1320 }
1321 1321
1322 JOW(jboolean, PeerConnectionFactory_nativeStartRtcEventLog)
1323 (JNIEnv* jni,
1324 jclass,
1325 jlong native_factory,
1326 jint file,
1327 jint filesize_limit_bytes) {
1328 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1329 factoryFromJava(native_factory));
1330 return factory->StartRtcEventLog(file, filesize_limit_bytes);
1331 }
1332
1333 JOW(void, PeerConnectionFactory_nativeStopRtcEventLog)(
1334 JNIEnv* jni, jclass, jlong native_factory) {
1335 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1336 factoryFromJava(native_factory));
1337 factory->StopRtcEventLog();
1338 }
1339
1340 JOW(void, PeerConnectionFactory_nativeSetOptions)( 1322 JOW(void, PeerConnectionFactory_nativeSetOptions)(
1341 JNIEnv* jni, jclass, jlong native_factory, jobject options) { 1323 JNIEnv* jni, jclass, jlong native_factory, jobject options) {
1342 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( 1324 rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
1343 factoryFromJava(native_factory)); 1325 factoryFromJava(native_factory));
1344 PeerConnectionFactoryInterface::Options options_to_set = 1326 PeerConnectionFactoryInterface::Options options_to_set =
1345 ParseOptionsFromJava(jni, options); 1327 ParseOptionsFromJava(jni, options);
1346 factory->SetOptions(options_to_set); 1328 factory->SetOptions(options_to_set);
1347 1329
1348 if (options_to_set.disable_network_monitor) { 1330 if (options_to_set.disable_network_monitor) {
1349 OwnedFactoryAndThreads* owner = 1331 OwnedFactoryAndThreads* owner =
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
1907 JOW(bool, PeerConnection_nativeGetStats)( 1889 JOW(bool, PeerConnection_nativeGetStats)(
1908 JNIEnv* jni, jobject j_pc, jobject j_observer, jlong native_track) { 1890 JNIEnv* jni, jobject j_pc, jobject j_observer, jlong native_track) {
1909 rtc::scoped_refptr<StatsObserverWrapper> observer( 1891 rtc::scoped_refptr<StatsObserverWrapper> observer(
1910 new rtc::RefCountedObject<StatsObserverWrapper>(jni, j_observer)); 1892 new rtc::RefCountedObject<StatsObserverWrapper>(jni, j_observer));
1911 return ExtractNativePC(jni, j_pc)->GetStats( 1893 return ExtractNativePC(jni, j_pc)->GetStats(
1912 observer, 1894 observer,
1913 reinterpret_cast<MediaStreamTrackInterface*>(native_track), 1895 reinterpret_cast<MediaStreamTrackInterface*>(native_track),
1914 PeerConnectionInterface::kStatsOutputLevelStandard); 1896 PeerConnectionInterface::kStatsOutputLevelStandard);
1915 } 1897 }
1916 1898
1899 JOW(bool, PeerConnection_nativeStartRtcEventLog)(
1900 JNIEnv* jni, jobject j_pc, int file_descriptor, int max_size_bytes) {
1901 return ExtractNativePC(jni, j_pc)->StartRtcEventLog(file_descriptor,
1902 max_size_bytes);
1903 }
1904
1905 JOW(void, PeerConnection_nativeStopRtcEventLog)(JNIEnv* jni, jobject j_pc) {
1906 ExtractNativePC(jni, j_pc)->StopRtcEventLog();
1907 }
1908
1917 JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) { 1909 JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) {
1918 PeerConnectionInterface::SignalingState state = 1910 PeerConnectionInterface::SignalingState state =
1919 ExtractNativePC(jni, j_pc)->signaling_state(); 1911 ExtractNativePC(jni, j_pc)->signaling_state();
1920 return JavaEnumFromIndex(jni, "PeerConnection$SignalingState", state); 1912 return JavaEnumFromIndex(jni, "PeerConnection$SignalingState", state);
1921 } 1913 }
1922 1914
1923 JOW(jobject, PeerConnection_iceConnectionState)(JNIEnv* jni, jobject j_pc) { 1915 JOW(jobject, PeerConnection_iceConnectionState)(JNIEnv* jni, jobject j_pc) {
1924 PeerConnectionInterface::IceConnectionState state = 1916 PeerConnectionInterface::IceConnectionState state =
1925 ExtractNativePC(jni, j_pc)->ice_connection_state(); 1917 ExtractNativePC(jni, j_pc)->ice_connection_state();
1926 return JavaEnumFromIndex(jni, "PeerConnection$IceConnectionState", state); 1918 return JavaEnumFromIndex(jni, "PeerConnection$IceConnectionState", state);
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
2300 return JavaStringFromStdString( 2292 return JavaStringFromStdString(
2301 jni, 2293 jni,
2302 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id()); 2294 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->id());
2303 } 2295 }
2304 2296
2305 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) { 2297 JOW(void, RtpReceiver_free)(JNIEnv* jni, jclass, jlong j_rtp_receiver_pointer) {
2306 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release(); 2298 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)->Release();
2307 } 2299 }
2308 2300
2309 } // namespace webrtc_jni 2301 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/api/android/java/src/org/webrtc/PeerConnection.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698