diff options
| author | braveyao@webrtc.org <braveyao@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-05 04:24:47 +0000 |
|---|---|---|
| committer | braveyao@webrtc.org <braveyao@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-05 04:24:47 +0000 |
| commit | c9d06348141937ae7dc655b2564fa41580edbc75 (patch) | |
| tree | 7899dd502a0d3a24e7bffb33cac274272d148197 /examples | |
| parent | 66a2eaeabcc1d3179c2f018716af5850dfb24d7c (diff) | |
| download | webrtc-c9d06348141937ae7dc655b2564fa41580edbc75.tar.gz | |
WebRTCDemo: correct set trace filter operation.
BUG=3285
TEST=Manul Test
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17389004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6051 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/media_demo/jni/video_engine_jni.cc | 3 | ||||
| -rw-r--r-- | examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/examples/android/media_demo/jni/video_engine_jni.cc b/examples/android/media_demo/jni/video_engine_jni.cc index 712e1786..c6589ece 100644 --- a/examples/android/media_demo/jni/video_engine_jni.cc +++ b/examples/android/media_demo/jni/video_engine_jni.cc @@ -631,7 +631,8 @@ JOWW(jint, VideoEngine_setTraceFile)(JNIEnv* jni, jobject, jstring j_filename, return webrtc::VideoEngine::SetTraceFile(filename.c_str(), file_counter); } -JOWW(jint, VideoEngine_setTraceFilter)(JNIEnv* jni, jobject, jint filter) { +JOWW(jint, VideoEngine_nativeSetTraceFilter)(JNIEnv* jni, jobject, + jint filter) { return webrtc::VideoEngine::SetTraceFilter(filter); } diff --git a/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java b/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java index 885f88be..7cfa5856 100644 --- a/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java +++ b/examples/android/media_demo/src/org/webrtc/webrtcdemo/VideoEngine.java @@ -29,7 +29,7 @@ public class VideoEngine { TRACE_DEBUG(0x0800), TRACE_INFO(0x1000), TRACE_TERSE_INFO(0x2000), - TRACE_ALL(0xfff); + TRACE_ALL(0xffff); public final int level; TraceLevel(int level) { @@ -103,9 +103,9 @@ public class VideoEngine { public native int setTraceFile(String fileName, boolean fileCounter); public int setTraceFilter(TraceLevel filter) { - return filter.level; + return nativeSetTraceFilter(filter.level); } - private native int setTraceFilter(int filter); + private native int nativeSetTraceFilter(int filter); public int startRtpDump(int channel, String file, RtpDirections direction) { return startRtpDump(channel, file, direction.ordinal()); |