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

Side by Side Diff: webrtc/sdk/android/src/jni/peerconnection_jni.cc

Issue 2621003002: Android: Wrap webrtc::field_trial::FindFullName in Java (Closed)
Patch Set: Fix typo Created 3 years, 11 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/sdk/android/api/org/webrtc/PeerConnectionFactory.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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "webrtc/base/logging.h" 64 #include "webrtc/base/logging.h"
65 #include "webrtc/base/logsinks.h" 65 #include "webrtc/base/logsinks.h"
66 #include "webrtc/base/messagequeue.h" 66 #include "webrtc/base/messagequeue.h"
67 #include "webrtc/base/networkmonitor.h" 67 #include "webrtc/base/networkmonitor.h"
68 #include "webrtc/base/rtccertificategenerator.h" 68 #include "webrtc/base/rtccertificategenerator.h"
69 #include "webrtc/base/ssladapter.h" 69 #include "webrtc/base/ssladapter.h"
70 #include "webrtc/base/stringutils.h" 70 #include "webrtc/base/stringutils.h"
71 #include "webrtc/media/base/videocapturer.h" 71 #include "webrtc/media/base/videocapturer.h"
72 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 72 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
73 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 73 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
74 #include "webrtc/system_wrappers/include/field_trial.h"
74 #include "webrtc/system_wrappers/include/field_trial_default.h" 75 #include "webrtc/system_wrappers/include/field_trial_default.h"
75 #include "webrtc/system_wrappers/include/logcat_trace_context.h" 76 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
76 #include "webrtc/system_wrappers/include/trace.h" 77 #include "webrtc/system_wrappers/include/trace.h"
77 #include "webrtc/voice_engine/include/voe_base.h" 78 #include "webrtc/voice_engine/include/voe_base.h"
78 79
79 using cricket::WebRtcVideoDecoderFactory; 80 using cricket::WebRtcVideoDecoderFactory;
80 using cricket::WebRtcVideoEncoderFactory; 81 using cricket::WebRtcVideoEncoderFactory;
81 using rtc::Bind; 82 using rtc::Bind;
82 using rtc::Thread; 83 using rtc::Thread;
83 using rtc::ThreadManager; 84 using rtc::ThreadManager;
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 jni->ReleaseStringUTFChars(j_trials_init_string, init_string); 1138 jni->ReleaseStringUTFChars(j_trials_init_string, init_string);
1138 LOG(LS_INFO) << "initializeFieldTrials: " << field_trials_init_string; 1139 LOG(LS_INFO) << "initializeFieldTrials: " << field_trials_init_string;
1139 } 1140 }
1140 webrtc::field_trial::InitFieldTrialsFromString(field_trials_init_string); 1141 webrtc::field_trial::InitFieldTrialsFromString(field_trials_init_string);
1141 } 1142 }
1142 1143
1143 JOW(void, PeerConnectionFactory_initializeInternalTracer)(JNIEnv* jni, jclass) { 1144 JOW(void, PeerConnectionFactory_initializeInternalTracer)(JNIEnv* jni, jclass) {
1144 rtc::tracing::SetupInternalTracer(); 1145 rtc::tracing::SetupInternalTracer();
1145 } 1146 }
1146 1147
1148 JOW(jstring, PeerConnectionFactory_fieldTrialsFindFullName)
1149 (JNIEnv* jni, jclass, jstring j_name) {
1150 return JavaStringFromStdString(
1151 jni, webrtc::field_trial::FindFullName(JavaToStdString(jni, j_name)));
1152 }
1153
1147 JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)( 1154 JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)(
1148 JNIEnv* jni, jclass, jstring j_event_tracing_filename) { 1155 JNIEnv* jni, jclass, jstring j_event_tracing_filename) {
1149 if (!j_event_tracing_filename) 1156 if (!j_event_tracing_filename)
1150 return false; 1157 return false;
1151 1158
1152 const char* init_string = 1159 const char* init_string =
1153 jni->GetStringUTFChars(j_event_tracing_filename, NULL); 1160 jni->GetStringUTFChars(j_event_tracing_filename, NULL);
1154 LOG(LS_INFO) << "Starting internal tracing to: " << init_string; 1161 LOG(LS_INFO) << "Starting internal tracing to: " << init_string;
1155 bool ret = rtc::tracing::StartInternalCapture(init_string); 1162 bool ret = rtc::tracing::StartInternalCapture(init_string);
1156 jni->ReleaseStringUTFChars(j_event_tracing_filename, init_string); 1163 jni->ReleaseStringUTFChars(j_event_tracing_filename, init_string);
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
2587 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer) 2594 reinterpret_cast<RtpReceiverInterface*>(j_rtp_receiver_pointer)
2588 ->SetObserver(nullptr); 2595 ->SetObserver(nullptr);
2589 RtpReceiverObserver* observer = 2596 RtpReceiverObserver* observer =
2590 reinterpret_cast<RtpReceiverObserver*>(j_observer_pointer); 2597 reinterpret_cast<RtpReceiverObserver*>(j_observer_pointer);
2591 if (observer) { 2598 if (observer) {
2592 delete observer; 2599 delete observer;
2593 } 2600 }
2594 } 2601 }
2595 2602
2596 } // namespace webrtc_jni 2603 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698