diff options
| author | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-10 16:34:01 +0000 |
|---|---|---|
| committer | fischman@webrtc.org <fischman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-10 16:34:01 +0000 |
| commit | 15c0af444e490e0c7471e8acc957dba33d1c6c3d (patch) | |
| tree | ffddf01dac0a63e45500c37d1a3630ad7f53cb1b | |
| parent | 238aa38f829112d3fe8ca7453a2e9fcebf6c8ace (diff) | |
| download | webrtc-15c0af444e490e0c7471e8acc957dba33d1c6c3d.tar.gz | |
This is the first step to convert building the Android WebRTC demo to a proper GYP target, android ndk toolchains is being used to build the jni cpp files instead of using ndk-build.
R=fischman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1444005
Patch from Jeremy Mao <yujie.mao@intel.com>.
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3999 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | video_engine/test/android/jni/vie_android_java_api.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video_engine/test/android/jni/vie_android_java_api.cc b/video_engine/test/android/jni/vie_android_java_api.cc index 0f537e7d..e5dc33c7 100644 --- a/video_engine/test/android/jni/vie_android_java_api.cc +++ b/video_engine/test/android/jni/vie_android_java_api.cc @@ -683,10 +683,10 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRecei ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetReceiveCodec %s, pltype=%d, bitRate=%d, maxBitRate=%d," - " width=%d, height=%d, frameRate=%d, codecSpecific=%d \n", + " width=%d, height=%d, frameRate=%d \n", codec.plName, codec.plType, codec.startBitrate, codec.maxBitrate, codec.width, codec.height, - codec.maxFramerate, codec.codecSpecific); + codec.maxFramerate); int ret = vieData.codec->SetReceiveCodec(channel, codec); __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetReceiveCodec return %d", ret); @@ -759,7 +759,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_ } jobjectArray ret; - int i; int num = vieData.codec->NumberOfCodecs(); char info[32]; @@ -1612,7 +1611,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_ codecToList.plname, codecToList.pltype, codecToList.plfreq, codecToList.pacsize, codecToList.channels, codecToList.rate); - assert(written >= 0 && written < sizeof(info)); + assert(written >= 0 && written < static_cast<int>(sizeof(info))); __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "VoiceEgnine Codec[%d] %s", i, info); env->SetObjectArrayElement(ret, i, env->NewStringUTF( info )); |