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

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.

Browse Source 
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@3999 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org
2013-05-10 16:34:01 +00:00
parent 571b3369e7
commit d6ed000585
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/video_engine/test/android/jni/vie_android_java_api.cc
View File

@ -683,10 +683,10 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRecei
ANDROID_LOG_DEBUG, ANDROID_LOG_DEBUG,
WEBRTC_LOG_TAG, WEBRTC_LOG_TAG,
"SetReceiveCodec %s, pltype=%d, bitRate=%d, maxBitRate=%d," "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.plName, codec.plType, codec.startBitrate,
codec.maxBitrate, codec.width, codec.height, codec.maxBitrate, codec.width, codec.height,
codec.maxFramerate, codec.codecSpecific); codec.maxFramerate);
int ret = vieData.codec->SetReceiveCodec(channel, codec); int ret = vieData.codec->SetReceiveCodec(channel, codec);
__android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
"SetReceiveCodec return %d", ret); "SetReceiveCodec return %d", ret);
@ -759,7 +759,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_
} }
jobjectArray ret; jobjectArray ret;
int i;
int num = vieData.codec->NumberOfCodecs(); int num = vieData.codec->NumberOfCodecs();
char info[32]; char info[32];
@ -1612,7 +1611,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_
codecToList.plname, codecToList.pltype, codecToList.plname, codecToList.pltype,
codecToList.plfreq, codecToList.pacsize, codecToList.plfreq, codecToList.pacsize,
codecToList.channels, codecToList.rate); 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, __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
"VoiceEgnine Codec[%d] %s", i, info); "VoiceEgnine Codec[%d] %s", i, info);
env->SetObjectArrayElement(ret, i, env->NewStringUTF( info )); env->SetObjectArrayElement(ret, i, env->NewStringUTF( info ));