zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for the JNI interface of RtcEventLog functions.

Browse Source 
BUG=webrtc:4741

Review-Url: https://codereview.webrtc.org/2128483002
Cr-Commit-Position: refs/heads/master@{#13393}
This commit is contained in:
ivoc
2016-07-06 04:34:23 -07:00
committed by Commit bot
parent 75c88da8dd
commit 0c6f0f6d96
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/api/android/java/src/org/webrtc/PeerConnection.java
View File

@ -262,16 +262,14 @@ public class PeerConnection {
// stopped and a new one will start using the provided file. Logging will // stopped and a new one will start using the provided file. Logging will
// continue until the stopRtcEventLog function is called. The max_size_bytes // continue until the stopRtcEventLog function is called. The max_size_bytes
// argument is ignored, it is added for future use. // argument is ignored, it is added for future use.
public boolean startRtcEventLog( public boolean startRtcEventLog(int file_descriptor, int max_size_bytes) {
int file_descriptor, long max_size_bytes) { return nativeStartRtcEventLog(file_descriptor, max_size_bytes);
return nativeStartRtcEventLog(
nativePeerConnection, file_descriptor, max_size_bytes);
} }
// Stops recording an RTC event log. If no RTC event log is currently being // Stops recording an RTC event log. If no RTC event log is currently being
// recorded, this call will have no effect. // recorded, this call will have no effect.
public void stopRtcEventLog() { public void stopRtcEventLog() {
nativeStopRtcEventLog(nativePeerConnection); nativeStopRtcEventLog();
} }
// TODO(fischman): add support for DTMF-related methods once that API // TODO(fischman): add support for DTMF-related methods once that API
@ -325,9 +323,9 @@ public class PeerConnection {
private native List<RtpReceiver> nativeGetReceivers(); private native List<RtpReceiver> nativeGetReceivers();
private static native boolean nativeStartRtcEventLog( private native boolean nativeStartRtcEventLog(
long nativePeerConnection, int file_descriptor, long max_size_bytes); int file_descriptor, int max_size_bytes);
private static native void nativeStopRtcEventLog(long nativePeerConnection); private native void nativeStopRtcEventLog();
} }

28
webrtc/api/android/jni/peerconnection_jni.cc
View File

@ -1319,24 +1319,6 @@ JOW(void, PeerConnectionFactory_nativeStopAecDump)(
factory->StopAecDump(); factory->StopAecDump();
} }
JOW(jboolean, PeerConnectionFactory_nativeStartRtcEventLog)
(JNIEnv* jni,
jclass,
jlong native_factory,
jint file,
jint filesize_limit_bytes) {
rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
factoryFromJava(native_factory));
return factory->StartRtcEventLog(file, filesize_limit_bytes);
}
JOW(void, PeerConnectionFactory_nativeStopRtcEventLog)(
JNIEnv* jni, jclass, jlong native_factory) {
rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
factoryFromJava(native_factory));
factory->StopRtcEventLog();
}
JOW(void, PeerConnectionFactory_nativeSetOptions)( JOW(void, PeerConnectionFactory_nativeSetOptions)(
JNIEnv* jni, jclass, jlong native_factory, jobject options) { JNIEnv* jni, jclass, jlong native_factory, jobject options) {
rtc::scoped_refptr<PeerConnectionFactoryInterface> factory( rtc::scoped_refptr<PeerConnectionFactoryInterface> factory(
@ -1914,6 +1896,16 @@ JOW(bool, PeerConnection_nativeGetStats)(
PeerConnectionInterface::kStatsOutputLevelStandard); PeerConnectionInterface::kStatsOutputLevelStandard);
} }
JOW(bool, PeerConnection_nativeStartRtcEventLog)(
JNIEnv* jni, jobject j_pc, int file_descriptor, int max_size_bytes) {
return ExtractNativePC(jni, j_pc)->StartRtcEventLog(file_descriptor,
max_size_bytes);
}
JOW(void, PeerConnection_nativeStopRtcEventLog)(JNIEnv* jni, jobject j_pc) {
ExtractNativePC(jni, j_pc)->StopRtcEventLog();
}
JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) { JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) {
PeerConnectionInterface::SignalingState state = PeerConnectionInterface::SignalingState state =
ExtractNativePC(jni, j_pc)->signaling_state(); ExtractNativePC(jni, j_pc)->signaling_state();