From 63ea5ef5da2e469961ba7f92d77da8b47b0479f9 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Tue, 1 May 2012 22:13:49 +0000 Subject: [PATCH] Regenerate jni files and bring audio alive BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/550004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2153 4adac7df-926f-26a2-2b94-8c16560cd09d --- ...brtc_videoengineapp_vie_android_java_api.h | 522 +++++------- .../android_test/jni/vie_android_java_api.cc | 772 ++++++++++-------- .../videoengineapp/ViEAndroidJavaAPI.java | 4 +- 3 files changed, 653 insertions(+), 645 deletions(-) diff --git a/src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h b/src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h index 37a9c43ea7..c1eed72f04 100644 --- a/src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h +++ b/src/video_engine/main/test/android_test/jni/org_webrtc_videoengineapp_vie_android_java_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -17,476 +17,400 @@ #ifdef __cplusplus extern "C" { #endif + /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: NativeInit * Signature: (Landroid/content/Context;)Z */ -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_NativeInit -(JNIEnv *, jobject, jobject); +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_NativeInit + (JNIEnv *, jobject, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: GetVideoEngine * Signature: ()I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetVideoEngine -(JNIEnv *, jobject); - +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetVideoEngine + (JNIEnv *, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: Init - * Signature: (IIIZ)I + * Signature: (Z)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Init -(JNIEnv *, jobject, jboolean); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Init + (JNIEnv *, jobject, jboolean); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: Terminate * Signature: ()I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Terminate -(JNIEnv *, jobject); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Terminate + (JNIEnv *, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StartSend * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartSend -(JNIEnv *, jobject, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartSend + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StopRender * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopRender -(JNIEnv *, jobject, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopRender + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StopSend - * Signature: ()I + * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopSend -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopSend + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StartReceive - * Signature: ()I + * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartReceive -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartReceive + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StopReceive - * Signature: ()I + * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopReceive -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopReceive + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: CreateChannel * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_CreateChannel -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_CreateChannel + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetLocalReceiver * Signature: (II)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetLocalReceiver -(JNIEnv *, jobject, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetLocalReceiver + (JNIEnv *, jobject, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetSendDestination * Signature: (II[B)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendDestination -(JNIEnv *, jobject, jint, jint, jbyteArray); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendDestination + (JNIEnv *, jobject, jint, jint, jbyteArray); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetReceiveCodec - * Signature: (IIIIIIZ)I + * Signature: (IIIIII)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetReceiveCodec -(JNIEnv *, jobject, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetReceiveCodec + (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetSendCodec - * Signature: (IIIIIIZ)I + * Signature: (IIIIII)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendCodec -(JNIEnv *, jobject, jint, jint, jint, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendCodec + (JNIEnv *, jobject, jint, jint, jint, jint, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: AddRemoteRenderer - * Signature: (ILandroid/view/SurfaceView;)I + * Signature: (ILjava/lang/Object;)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_AddRemoteRenderer -(JNIEnv *, jobject, jint, jobject); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_AddRemoteRenderer + (JNIEnv *, jobject, jint, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: RemoveRemoteRenderer * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_RemoveRemoteRenderer -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_RemoveRemoteRenderer + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StartRender * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRender -(JNIEnv *, jobject, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRender + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StartCamera * Signature: (II)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartCamera -(JNIEnv *, jobject,jint channel,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartCamera + (JNIEnv *, jobject, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: StopCamera * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopCamera -(JNIEnv *, jobject,jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopCamera + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: GetCameraOrientation * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetCameraOrientation -(JNIEnv *, jobject, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetCameraOrientation + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetRotation - * Signature: (I)I + * Signature: (II)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRotation -(JNIEnv *, jobject, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRotation + (JNIEnv *, jobject, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: EnableNACK * Signature: (IZ)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNACK -(JNIEnv *, jobject, jint, jboolean); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNACK + (JNIEnv *, jobject, jint, jboolean); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: EnablePLI * Signature: (IZ)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnablePLI -(JNIEnv *, jobject, jint, jboolean); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: StartSendNative - * Signature: (III[BIIIIIILandroid/view/SurfaceView;III)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartSendNative -(JNIEnv *, jobject, jint, jint, jint, jbyteArray, jint, jint, -jint, jint, jint, jint, jobject, jint, jint, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: StartListenNative - * Signature: (III[BIIIIIIILandroid/view/SurfaceView;)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartListenNative -(JNIEnv *, jobject, jint, jint, jint, jbyteArray, jint, jint, -jint, jint, jint, jint, jint, jobject); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: StopAllNative - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopAllNative -(JNIEnv *, jobject, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnablePLI + (JNIEnv *, jobject, jint, jboolean); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI * Method: SetCallback * Signature: (ILorg/webrtc/videoengineapp/IViEAndroidCallback;)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetCallback -(JNIEnv *, jobject, jint, jobject); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetCallback + (JNIEnv *, jobject, jint, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_Create - * Signature: (Landroid/app/Activity;)Z - */ -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Create -(JNIEnv *, jobject, jobject); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_Delete + * Method: VoE_Create * Signature: ()Z */ -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Delete -(JNIEnv *, jobject); +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Create + (JNIEnv *, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_Init - * Signature: (IIIZZ)I + * Method: VoE_Delete + * Signature: ()Z */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Init -(JNIEnv *, jobject, jint, jint, jint, jboolean, jboolean); +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Delete + (JNIEnv *, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_Terminate - * Signature: ()I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Terminate -(JNIEnv *, jobject); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_CreateChannel - * Signature: ()I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_CreateChannel -(JNIEnv *, jobject); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_DeleteChannel - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_DeleteChannel -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetLocalReceiver - * Signature: (II)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetLocalReceiver -(JNIEnv *, jobject, jint, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetSendDestination - * Signature: (IILjava/lang/String;)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSendDestination -(JNIEnv *, jobject, jint, jint, jstring); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StartListen - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartListen -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StartPlayout - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayout -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StartSend - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartSend -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StopListen - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopListen -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StopPlayout - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayout -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StopSend - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopSend -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetSpeakerVolume - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSpeakerVolume -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetLoudspeakerStatus + * Method: VoE_Init * Signature: (Z)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetLoudspeakerStatus -(JNIEnv *, jobject, jboolean); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Init + (JNIEnv *, jobject, jboolean); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StartPlayingFileLocally - * Signature: (ILjava/lang/String;Z)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileLocally -(JNIEnv *, jobject, jint, jstring, jboolean); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StopPlayingFileLocally - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayingFileLocally -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StartPlayingFileAsMicrophone - * Signature: (ILjava/lang/String;Z)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileAsMicrophone -(JNIEnv *, jobject, jint, jstring, jboolean); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_StopPlayingFileAsMicrophone - * Signature: (I)I - */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayingFileAsMicrophone -(JNIEnv *, jobject, jint); - -/* - * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_NumOfCodecs + * Method: VoE_Terminate * Signature: ()I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_NumOfCodecs -(JNIEnv *, jobject); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Terminate + (JNIEnv *, jobject); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetSendCodec + * Method: VoE_CreateChannel + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1CreateChannel + (JNIEnv *, jobject); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_DeleteChannel + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1DeleteChannel + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetLocalReceiver * Signature: (II)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSendCodec -(JNIEnv *, jobject, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetLocalReceiver + (JNIEnv *, jobject, jint, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetECStatus - * Signature: (ZI)I + * Method: VoE_SetSendDestination + * Signature: (IILjava/lang/String;)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetECStatus -(JNIEnv *, jobject, jboolean, jint, jint, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSendDestination + (JNIEnv *, jobject, jint, jint, jstring); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetNSStatus - * Signature: (ZI)I + * Method: VoE_StartListen + * Signature: (I)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetNSStatus -(JNIEnv *, jobject, jboolean, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartListen + (JNIEnv *, jobject, jint); /* * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI - * Method: VE_SetAGCStatus + * Method: VoE_StartPlayout + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayout + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartSend + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartSend + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopListen + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopListen + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayout + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayout + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopSend + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopSend + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetSpeakerVolume + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSpeakerVolume + (JNIEnv *, jobject, jint); + + + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetLoudspeakerStatus + * Signature: (Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetLoudspeakerStatus + (JNIEnv *, jobject, jboolean); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartPlayingFileLocally + * Signature: (ILjava/lang/String;Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayingFileLocally + (JNIEnv *, jobject, jint, jstring, jboolean); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayingFileLocally + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayingFileLocally + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartPlayingFileAsMicrophone + * Signature: (ILjava/lang/String;Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayingFileAsMicrophone + (JNIEnv *, jobject, jint, jstring, jboolean); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayingFileAsMicrophone + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayingFileAsMicrophone + (JNIEnv *, jobject, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_NumOfCodecs + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1NumOfCodecs + (JNIEnv *, jobject); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetSendCodec + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSendCodec + (JNIEnv *, jobject, jint, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetECStatus + * Signature: (ZIII)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetECStatus + (JNIEnv *, jobject, jboolean, jint, jint, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetAGCStatus * Signature: (ZI)I */ -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetAGCStatus -(JNIEnv *, jobject, jboolean, jint); +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetAGCStatus + (JNIEnv *, jobject, jboolean, jint); + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetNSStatus + * Signature: (ZI)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetNSStatus + (JNIEnv *, jobject, jboolean, jint); #ifdef __cplusplus } diff --git a/src/video_engine/main/test/android_test/jni/vie_android_java_api.cc b/src/video_engine/main/test/android_test/jni/vie_android_java_api.cc index 112667f220..2bb8dcfe89 100644 --- a/src/video_engine/main/test/android_test/jni/vie_android_java_api.cc +++ b/src/video_engine/main/test/android_test/jni/vie_android_java_api.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -33,35 +33,35 @@ #define WEBRTC_LOG_TAG "*WEBRTCN*" #define VALIDATE_BASE_POINTER \ - if (!veData.base) \ + if (!voeData.base) \ { \ __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ "Base pointer doesn't exist"); \ return -1; \ } #define VALIDATE_CODEC_POINTER \ - if (!veData.codec) \ + if (!voeData.codec) \ { \ __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ "Codec pointer doesn't exist"); \ return -1; \ } #define VALIDATE_FILE_POINTER \ - if (!veData.file) \ + if (!voeData.file) \ { \ __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ "File pointer doesn't exist"); \ return -1; \ } #define VALIDATE_APM_POINTER \ - if (!veData.codec) \ + if (!voeData.codec) \ { \ __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ "Apm pointer doesn't exist"); \ return -1; \ } #define VALIDATE_HARDWARE_POINTER \ - if (!veData.hardware) \ + if (!voeData.hardware) \ { \ __android_log_write( \ ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ @@ -69,7 +69,7 @@ return -1; \ } #define VALIDATE_VOLUME_POINTER \ - if (!veData.volume) \ + if (!voeData.volume) \ { \ __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, \ "Volume pointer doesn't exist"); \ @@ -116,7 +116,7 @@ typedef struct JavaVM* webrtcGlobalVM; // Global variables visible in this file -static VoiceEngineData veData; +static VoiceEngineData voeData; static VideoEngineData vieData; // "Local" functions (i.e. not Java accessible) @@ -234,9 +234,9 @@ jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) { } // Init VoiceEngine data - memset(&veData, 0, sizeof(veData)); + memset(&voeData, 0, sizeof(voeData)); // Store the JVM - veData.jvm = vm; + voeData.jvm = vm; // Init VideoEngineData data memset(&vieData, 0, sizeof(vieData)); @@ -244,11 +244,12 @@ jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) { return JNI_VERSION_1_4; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: NativeInit -// Signature: (Landroid/content/Context;)Z -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_NativeInit( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: NativeInit + * Signature: (Landroid/content/Context;)Z + */ +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_NativeInit( JNIEnv * env, jobject, jobject context) @@ -256,12 +257,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_NativeInit( return true; } -// VideoEngine API wrapper functions -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: GetVideoEngine -// Signature: ()I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetVideoEngine( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: GetVideoEngine + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetVideoEngine( JNIEnv *, jobject context) { @@ -327,9 +328,11 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetVideoEngine( return 0; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: Init -// Signature: (IIIZ)I +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: Init + * Signature: (Z)I + */ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Init( JNIEnv *, jobject, @@ -367,11 +370,11 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Init( "Could not set trace filter"); } } - if (veData.ve) // VoiceEngine is enabled + if (voeData.ve) // VoiceEngine is enabled { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetVoiceEngine"); - if (0 != vieData.base->SetVoiceEngine(veData.ve)) + if (0 != vieData.base->SetVoiceEngine(voeData.ve)) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetVoiceEngine failed"); @@ -442,9 +445,11 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_Terminat } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StartSend -// Signature: (I)I +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StartSend + * Signature: (I)I + */ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartSend( JNIEnv *, jobject, @@ -461,13 +466,15 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartSen } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StopRender -// Signature: (I)I +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StopRender + * Signature: (I)I + */ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopRender( - JNIEnv *, - jobject, - jint channel) + JNIEnv *, + jobject, + jint channel) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "StopRender"); @@ -479,9 +486,11 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopRend } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: Stop -// Signature: ()I +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StopSend + * Signature: (I)I + */ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopSend( JNIEnv *, jobject, @@ -497,9 +506,11 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopSend } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StartReceive -// Signature: ()I +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StartReceive + * Signature: (I)I + */ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartReceive( JNIEnv *, jobject, @@ -515,11 +526,12 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRec } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StopReceive -// Signature: ()I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopReceive( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StopReceive + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopReceive( JNIEnv *, jobject, jint channel) @@ -533,11 +545,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopReceive( } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: CreateChannel -// Signature: ()I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_CreateChannel( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: CreateChannel + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_CreateChannel( JNIEnv *, jobject, jint voiceChannel) @@ -560,11 +573,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_CreateChannel( } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetLocalReceiver -// Signature: (II)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetLocalReceiver( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetLocalReceiver + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetLocalReceiver( JNIEnv *, jobject, jint channel, @@ -581,11 +595,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetLocalReceiver( } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetSendDestination -// Signature: (II[B)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendDestination( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetSendDestination + * Signature: (II[B)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendDestination( JNIEnv * env, jobject, jint channel, @@ -611,11 +626,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendDestination( } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetReceiveCodec -// Signature: (IIIIII)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetReceiveCodec( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetReceiveCodec + * Signature: (IIIIII)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetReceiveCodec( JNIEnv *, jobject, jint channel, @@ -646,11 +662,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetReceiveCodec( return ret; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetSendCodec -// Signature: (IIIIII)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendCodec( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetSendCodec + * Signature: (IIIIII)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendCodec( JNIEnv *, jobject, jint channel, @@ -697,11 +714,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetSendCodec( return vieData.codec->SetSendCodec(channel, codec); } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: AddRemoteRenderer -// Signature: (ILandroid/view/SurfaceView;)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_AddRemoteRenderer( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: AddRemoteRenderer + * Signature: (ILjava/lang/Object;)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_AddRemoteRenderer( JNIEnv *, jobject, jint channel, @@ -716,11 +734,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_AddRemoteRenderer( } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: RemoveRemoteRenderer -// Signature: (I)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_RemoveRemoteRenderer( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: RemoveRemoteRenderer + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_RemoveRemoteRenderer( JNIEnv *, jobject, jint channel) @@ -736,11 +755,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_RemoveRemoteRenderer( return 0; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StartRender -// Signature: (I)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRender( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StartRender + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRender( JNIEnv *, jobject, jint channel) @@ -755,11 +775,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartRender( } } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StarteCamera -// Signature: (II)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartCamera( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StartCamera + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartCamera( JNIEnv * env, jobject, jint channel, @@ -806,11 +827,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StartCamera( return cameraId; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: StopCamera -// Signature: ()I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopCamera( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: StopCamera + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopCamera( JNIEnv *, jobject, jint cameraId) @@ -828,11 +850,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_StopCamera( return ret; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: GetCameraOrientation -// Signature: (I)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetCameraOrientation( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: GetCameraOrientation + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetCameraOrientation( JNIEnv *, jobject, jint cameraNum) @@ -859,11 +882,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_GetCameraOrientation( } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetRotation -// Signature: (II)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRotation( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetRotation + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRotation( JNIEnv *, jobject, jint captureId, @@ -884,15 +908,16 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetRotation( return ret; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: EnableNACK -// Signature: (IZ)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNACK( - JNIEnv *, - jobject, - jint channel, - jboolean enable) +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: EnableNACK + * Signature: (IZ)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNACK( + JNIEnv *, + jobject, + jint channel, + jboolean enable) { if (NULL == vieData.rtp) return -1; @@ -908,11 +933,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnableNACK( return ret; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: EnablePLI -// Signature: (IZ)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnablePLI( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: EnablePLI + * Signature: (IZ)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnablePLI( JNIEnv *, jobject, jint channel, @@ -933,11 +959,12 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_EnablePLI( return ret; } -// Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI -// Method: SetCallback -// Signature: (ILorg/webrtc/videoengineapp/IViEAndroidCallback;)I -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetCallback( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: SetCallback + * Signature: (ILorg/webrtc/videoengineapp/IViEAndroidCallback;)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetCallback( JNIEnv * env, jobject, jint channel, @@ -965,27 +992,27 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetCallback( // VoiceEngine API wrapper functions // -// Create VoiceEngine instance -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Create( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_Create + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Create( JNIEnv *env, - jobject, - jobject context) + jobject) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "Create"); // Check if already created - if (veData.ve) { + if (voeData.ve) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "VoE already created"); return false; } - // Init Android Object - VoiceEngine::SetAndroidObjects(veData.jvm, env, context); // Create - veData.ve = VoiceEngine::Create(); - if (!veData.ve) { + voeData.ve = VoiceEngine::Create(); + if (!voeData.ve) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Create VoE failed"); return false; @@ -995,7 +1022,7 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Create( if (!VE_GetSubApis()) { // If not OK, release all sub-APIs and delete VoE VE_ReleaseSubApis(); - if (!VoiceEngine::Delete(veData.ve)) { + if (!VoiceEngine::Delete(voeData.ve)) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Delete VoE failed"); } @@ -1005,14 +1032,17 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Create( return true; } -// Delete VoiceEngine instance -JNIEXPORT jboolean JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Delete( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_Delete + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Delete( JNIEnv *, jobject) { // Check if exists - if (!veData.ve) { + if (!voeData.ve) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "VoE does not exist"); return false; @@ -1022,13 +1052,13 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Delete( VE_ReleaseSubApis(); // Delete - if (!VoiceEngine::Delete(veData.ve)) { + if (!VoiceEngine::Delete(voeData.ve)) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Delete VoE failed"); return false; } - veData.ve = NULL; + voeData.ve = NULL; // Clear instance independent Java objects VoiceEngine::SetAndroidObjects(NULL, NULL, NULL); @@ -1036,77 +1066,87 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Delete( return true; } -// [Base] Initialize VoiceEngine -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Init( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_Init + * Signature: (Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Init( JNIEnv *, jobject, - jboolean enableTrace, - jboolean useExtTrans) + jboolean enableTrace) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "VE_Init"); VALIDATE_BASE_POINTER; - if (useExtTrans) { - // Not implemented - return -1; - } - - return veData.base->Init(); + return voeData.base->Init(); } -// [Base] Terminate VoiceEngine -JNIEXPORT jint -JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_Terminate( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_Terminate + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1Terminate( JNIEnv *, jobject) { VALIDATE_BASE_POINTER; - jint retVal = veData.base->Terminate(); + jint retVal = voeData.base->Terminate(); return retVal; } -// [Base] Create channel -JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_CreateChannel( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_CreateChannel + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1CreateChannel( JNIEnv *, jobject) { VALIDATE_BASE_POINTER; webrtc::CodecInst voiceCodec; - int numOfVeCodecs = veData.codec->NumOfCodecs(); + int numOfVeCodecs = voeData.codec->NumOfCodecs(); //enum all the supported codec __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "Supported Voice Codec:\n"); for (int i = 0; i < numOfVeCodecs; ++i) { - if (veData.codec->GetCodec(i, voiceCodec) != -1) { + if (voeData.codec->GetCodec(i, voiceCodec) != -1) { __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "num: %d name: %s\n", i, voiceCodec.plname); } } - jint channel = veData.base->CreateChannel(); + jint channel = voeData.base->CreateChannel(); return channel; } -// [Base] Delete channel -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_DeleteChannel( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_DeleteChannel + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1DeleteChannel( JNIEnv *, jobject, jint channel) { VALIDATE_BASE_POINTER; - return veData.base->DeleteChannel(channel); + return voeData.base->DeleteChannel(channel); } -// [Base] SetLocalReceiver -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetLocalReceiver( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetLocalReceiver + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetLocalReceiver( JNIEnv *, jobject, jint channel, @@ -1114,12 +1154,15 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetLocalReceiver( { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetLocalReceiver"); VALIDATE_BASE_POINTER; - return veData.base->SetLocalReceiver(channel, port); + return voeData.base->SetLocalReceiver(channel, port); } -// [Base] SetSendDestination -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSendDestination( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetSendDestination + * Signature: (IILjava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSendDestination( JNIEnv *env, jobject, jint channel, @@ -1135,161 +1178,141 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSendDestination( "Could not get UTF string"); return -1; } - jint retVal = veData.base->SetSendDestination(channel, port, ipaddrNative); + jint retVal = voeData.base->SetSendDestination(channel, port, ipaddrNative); env->ReleaseStringUTFChars(ipaddr, ipaddrNative); return retVal; } -// [Base] StartListen -JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartListen( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartListen + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartListen( JNIEnv *, jobject, jint channel) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "StartListen"); VALIDATE_BASE_POINTER; - return veData.base->StartReceive(channel); + return voeData.base->StartReceive(channel); } -// [Base] Start playout -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayout( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartPlayout + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayout( JNIEnv *, jobject, jint channel) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "StartPlayout"); VALIDATE_BASE_POINTER; - return veData.base->StartPlayout(channel); + return voeData.base->StartPlayout(channel); } -// [Base] Start send -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartSend( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartSend + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartSend( JNIEnv *, jobject, jint channel) { __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "StartSend"); VALIDATE_BASE_POINTER; - return veData.base->StartSend(channel); + return voeData.base->StartSend(channel); } -// [Base] Stop listen -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopListen( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopListen + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopListen( JNIEnv *, jobject, jint channel) { VALIDATE_BASE_POINTER; - return veData.base->StartReceive(channel); + return voeData.base->StartReceive(channel); } -// [Base] Stop playout -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayout( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayout + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayout( JNIEnv *, jobject, jint channel) { VALIDATE_BASE_POINTER; - return veData.base->StopPlayout(channel); + return voeData.base->StopPlayout(channel); } -// [Base] Stop send -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopSend( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopSend + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopSend( JNIEnv *, jobject, jint channel) { VALIDATE_BASE_POINTER; - return veData.base->StopSend(channel); + return voeData.base->StopSend(channel); } -// [codec] Number of codecs -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_NumOfCodecs( - JNIEnv *, - jobject) -{ - VALIDATE_CODEC_POINTER; - return veData.codec->NumOfCodecs(); -} - -// [codec] Set send codec -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSendCodec( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetSpeakerVolume + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSpeakerVolume( JNIEnv *, jobject, - jint channel, - jint index) + jint level) { - VALIDATE_CODEC_POINTER; + VALIDATE_VOLUME_POINTER; - webrtc::CodecInst codec; - - for (int i = 0; i < veData.codec->NumOfCodecs(); ++i) { - webrtc::CodecInst codecToList; - veData.codec->GetCodec(i, codecToList); - __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, - "VE Codec list %s, pltype=%d\n", - codecToList.plname, codecToList.pltype); - } - - if (veData.codec->GetCodec(index, codec) != 0) { - __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, - "Failed to get codec"); + if (voeData.volume->SetSpeakerVolume(level) != 0) { return -1; } - __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetSendCodec %s\n", - codec.plname); - - return veData.codec->SetSendCodec(channel, codec); + return 0; } -// [audioprocessing] SetNSStatus -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetNSStatus( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetLoudspeakerStatus + * Signature: (Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetLoudspeakerStatus( JNIEnv *, jobject, - jboolean enable, - jint mode) + jboolean enable) { - //TODO implement - return -1; + VALIDATE_HARDWARE_POINTER; + + if (voeData.hardware->SetLoudspeakerStatus(enable) != 0) { + return -1; + } + + return 0; } -// [audioprocessing] SetAGCStatus -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetAGCStatus( - JNIEnv *, - jobject, - jboolean enable, - jint mode) -{ - //TODO implement - return -1; -} - -// [audioprocessing] SetECStatus -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetECStatus( - JNIEnv *, - jobject, - jboolean enable, - jint mode, - jint AESmode, - jint AESattenuation) -{ - //TODO implement - return -1; -} - -// [File] Start play file locally -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileLocally( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartPlayingFileLocally + * Signature: (ILjava/lang/String;Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayingFileLocally( JNIEnv * env, jobject, jint channel, @@ -1305,7 +1328,7 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileLocally( return -1; } - jint retVal = veData.file->StartPlayingFileLocally(channel, + jint retVal = voeData.file->StartPlayingFileLocally(channel, fileNameNative, loop); @@ -1314,20 +1337,26 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileLocally( return retVal; } -// [File] Stop play file locally -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayingFileLocally( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayingFileLocally + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayingFileLocally( JNIEnv *, jobject, jint channel) { VALIDATE_FILE_POINTER; - return veData.file->StopPlayingFileLocally(channel); + return voeData.file->StopPlayingFileLocally(channel); } -// [File] Start playing file as microphone -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileAsMicrophone( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StartPlayingFileAsMicrophone + * Signature: (ILjava/lang/String;Z)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StartPlayingFileAsMicrophone( JNIEnv *env, jobject, jint channel, @@ -1343,7 +1372,7 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileAsMicrophone return -1; } - jint retVal = veData.file->StartPlayingFileAsMicrophone(channel, + jint retVal = voeData.file->StartPlayingFileAsMicrophone(channel, fileNameNative, loop); @@ -1352,56 +1381,113 @@ Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StartPlayingFileAsMicrophone return retVal; } -// [File] Stop playing file as microphone -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_StopPlayingFileAsMicrophone( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_StopPlayingFileAsMicrophone + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1StopPlayingFileAsMicrophone( JNIEnv *, jobject, jint channel) { VALIDATE_FILE_POINTER; - return veData.file->StopPlayingFileAsMicrophone(channel); + return voeData.file->StopPlayingFileAsMicrophone(channel); } -// [Volume] Set speaker volume -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetSpeakerVolume( + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_NumOfCodecs + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1NumOfCodecs( JNIEnv *, - jobject, - jint level) + jobject) { - VALIDATE_VOLUME_POINTER; - - if (veData.volume->SetSpeakerVolume(level) != 0) { - return -1; - } - - unsigned int storedVolume = 0; - if (veData.volume->GetSpeakerVolume(storedVolume) != 0) { - return -1; - } - - if (storedVolume != level) { - return -1; - } - - return 0; + VALIDATE_CODEC_POINTER; + return voeData.codec->NumOfCodecs(); } -// [Hardware] Set speaker volume -JNIEXPORT jint JNICALL -Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VE_SetLoudspeakerStatus( +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetSendCodec + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetSendCodec( JNIEnv *, jobject, - jboolean enable) + jint channel, + jint index) { - VALIDATE_HARDWARE_POINTER; + VALIDATE_CODEC_POINTER; - if (veData.hardware->SetLoudspeakerStatus(enable) != 0) { - return -1; + webrtc::CodecInst codec; + + for (int i = 0; i < voeData.codec->NumOfCodecs(); ++i) { + webrtc::CodecInst codecToList; + voeData.codec->GetCodec(i, codecToList); + __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, + "VE Codec list %s, pltype=%d\n", + codecToList.plname, codecToList.pltype); } - return 0; + if (voeData.codec->GetCodec(index, codec) != 0) { + __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, + "Failed to get codec"); + return -1; + } + __android_log_print(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetSendCodec %s\n", + codec.plname); + + return voeData.codec->SetSendCodec(channel, codec); +} + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetECStatus + * Signature: (ZIII)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetECStatus( + JNIEnv *, + jobject, + jboolean enable, + jint mode, + jint AESmode, + jint AESattenuation) +{ + // TODO(leozwang) implement + return -1; +} + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetAGCStatus + * Signature: (ZI)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetAGCStatus( + JNIEnv *, + jobject, + jboolean enable, + jint mode) +{ + // TODO(leozwang) implement + return -1; +} + +/* + * Class: org_webrtc_videoengineapp_ViEAndroidJavaAPI + * Method: VoE_SetNSStatus + * Signature: (ZI)I + */ +JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_VoE_1SetNSStatus( + JNIEnv *, + jobject, + jboolean enable, + jint mode) +{ + // TODO(leozwang) implement + return -1; } // @@ -1413,56 +1499,56 @@ bool VE_GetSubApis() { bool getOK = true; // Base - veData.base = VoEBase::GetInterface(veData.ve); - if (!veData.base) { + voeData.base = VoEBase::GetInterface(voeData.ve); + if (!voeData.base) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get base sub-API failed"); getOK = false; } // Codec - veData.codec = VoECodec::GetInterface(veData.ve); - if (!veData.codec) { + voeData.codec = VoECodec::GetInterface(voeData.ve); + if (!voeData.codec) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get codec sub-API failed"); getOK = false; } // File - veData.file = VoEFile::GetInterface(veData.ve); - if (!veData.file) { + voeData.file = VoEFile::GetInterface(voeData.ve); + if (!voeData.file) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get file sub-API failed"); getOK = false; } // Network - veData.netw = VoENetwork::GetInterface(veData.ve); - if (!veData.netw) { + voeData.netw = VoENetwork::GetInterface(voeData.ve); + if (!voeData.netw) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get network sub-API failed"); getOK = false; } // audioprocessing - veData.apm = VoEAudioProcessing::GetInterface(veData.ve); - if (!veData.apm) { + voeData.apm = VoEAudioProcessing::GetInterface(voeData.ve); + if (!voeData.apm) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get VoEAudioProcessing sub-API failed"); getOK = false; } // Volume - veData.volume = VoEVolumeControl::GetInterface(veData.ve); - if (!veData.volume) { + voeData.volume = VoEVolumeControl::GetInterface(voeData.ve); + if (!voeData.volume) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get volume sub-API failed"); getOK = false; } // Hardware - veData.hardware = VoEHardware::GetInterface(veData.ve); - if (!veData.hardware) { + voeData.hardware = VoEHardware::GetInterface(voeData.ve); + if (!voeData.hardware) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Get hardware sub-API failed"); getOK = false; @@ -1476,86 +1562,86 @@ bool VE_ReleaseSubApis() { bool releaseOK = true; // Base - if (veData.base) { - if (0 != veData.base->Release()) { + if (voeData.base) { + if (0 != voeData.base->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release base sub-API failed"); releaseOK = false; } else { - veData.base = NULL; + voeData.base = NULL; } } // Codec - if (veData.codec) { - if (0 != veData.codec->Release()) { + if (voeData.codec) { + if (0 != voeData.codec->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release codec sub-API failed"); releaseOK = false; } else { - veData.codec = NULL; + voeData.codec = NULL; } } // File - if (veData.file) { - if (0 != veData.file->Release()) { + if (voeData.file) { + if (0 != voeData.file->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release file sub-API failed"); releaseOK = false; } else { - veData.file = NULL; + voeData.file = NULL; } } // Network - if (veData.netw) { - if (0 != veData.netw->Release()) { + if (voeData.netw) { + if (0 != voeData.netw->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release network sub-API failed"); releaseOK = false; } else { - veData.netw = NULL; + voeData.netw = NULL; } } // apm - if (veData.apm) { - if (0 != veData.apm->Release()) { + if (voeData.apm) { + if (0 != voeData.apm->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release apm sub-API failed"); releaseOK = false; } else { - veData.apm = NULL; + voeData.apm = NULL; } } // Volume - if (veData.volume) { - if (0 != veData.volume->Release()) { + if (voeData.volume) { + if (0 != voeData.volume->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release volume sub-API failed"); releaseOK = false; } else { - veData.volume = NULL; + voeData.volume = NULL; } } // Hardware - if (veData.hardware) { - if (0 != veData.hardware->Release()) { + if (voeData.hardware) { + if (0 != voeData.hardware->Release()) { __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG, "Release hardware sub-API failed"); releaseOK = false; } else { - veData.hardware = NULL; + voeData.hardware = NULL; } } diff --git a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java index a0797c2e6b..a1dd81091a 100644 --- a/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java +++ b/src/video_engine/main/test/android_test/src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java @@ -43,7 +43,6 @@ public class ViEAndroidJavaAPI { public native int Init(boolean enableTrace); public native int Terminate(); - public native int StartSend(int channel); public native int StopRender(int channel); public native int StopSend(int channel); @@ -83,11 +82,10 @@ public class ViEAndroidJavaAPI { // Voice Engine API // Create and Delete functions - public native boolean VoE_Create(Activity context); + public native boolean VoE_Create(); public native boolean VoE_Delete(); // Initialization and Termination functions - public native int VoE_Authenticate(String key); public native int VoE_Init(boolean enableTrace); public native int VoE_Terminate();