Chromium Code Reviews| Index: talk/app/webrtc/java/jni/peerconnection_jni.cc |
| diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc |
| index 984227de45dc1ee1831018d6195b249b430ec066..46331e035f21397f746760e439ab7a6844916069 100644 |
| --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc |
| +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc |
| @@ -74,10 +74,11 @@ |
| #include "talk/media/webrtc/webrtcvideoencoderfactory.h" |
| #include "webrtc/base/bind.h" |
| #include "webrtc/base/checks.h" |
| +#include "webrtc/base/event_tracer.h" |
| #include "webrtc/base/logging.h" |
| #include "webrtc/base/logsinks.h" |
| -#include "webrtc/base/networkmonitor.h" |
| #include "webrtc/base/messagequeue.h" |
| +#include "webrtc/base/networkmonitor.h" |
| #include "webrtc/base/ssladapter.h" |
| #include "webrtc/base/stringutils.h" |
| #include "webrtc/system_wrappers/include/field_trial_default.h" |
| @@ -1054,6 +1055,34 @@ JOW(void, PeerConnectionFactory_initializeFieldTrials)( |
| webrtc::field_trial::InitFieldTrialsFromString(field_trials_init_string); |
| } |
| +JOW(void, PeerConnectionFactory_initializeInternalTracer)( |
| + JNIEnv* jni, jclass) { |
| + webrtc::EventTracer::SetupInternalTracer(); |
| +} |
| + |
| +JOW(jboolean, PeerConnectionFactory_startInternalTracingCapture)( |
| + JNIEnv* jni, jclass, jstring j_event_tracing_filename) { |
| + if (j_event_tracing_filename == NULL) |
|
tommi
2015/11/20 13:49:54
nit: use |if (!ptr)| or |if (ptr == nullptr)| I p
pbos-webrtc
2015/11/20 15:11:05
Done.
|
| + return false; |
| + |
| + const char* init_string = |
| + jni->GetStringUTFChars(j_event_tracing_filename, NULL); |
| + LOG(LS_INFO) << "Starting internal tracing to: " << init_string; |
| + bool ret = webrtc::EventTracer::StartInternalCapture(init_string); |
| + jni->ReleaseStringUTFChars(j_event_tracing_filename, init_string); |
| + return ret; |
| +} |
| + |
| +JOW(void, PeerConnectionFactory_stopInternalTracingCapture)( |
| + JNIEnv* jni, jclass) { |
| + webrtc::EventTracer::StopInternalCapture(); |
| +} |
| + |
| +JOW(void, PeerConnectionFactory_shutdownInternalTracer)( |
| + JNIEnv* jni, jclass) { |
| + webrtc::EventTracer::ShutdownInternalTracer(); |
| +} |
| + |
| // Helper struct for working around the fact that CreatePeerConnectionFactory() |
| // comes in two flavors: either entirely automagical (constructing its own |
| // threads and deleting them on teardown, but no external codec factory support) |