From d6ed000585ff5d4854c374966f858368bb16ea15 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Fri, 10 May 2013 16:34:01 +0000 Subject: [PATCH] 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 . git-svn-id: http://webrtc.googlecode.com/svn/trunk@3999 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_engine/test/android/jni/vie_android_java_api.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/video_engine/test/android/jni/vie_android_java_api.cc b/webrtc/video_engine/test/android/jni/vie_android_java_api.cc index 0f537e7da1..e5dc33c78a 100644 --- a/webrtc/video_engine/test/android/jni/vie_android_java_api.cc +++ b/webrtc/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(sizeof(info))); __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "VoiceEgnine Codec[%d] %s", i, info); env->SetObjectArrayElement(ret, i, env->NewStringUTF( info ));