From ac32540a9b1d47cc3fc3e437f66d205a6e5d51df Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 25 Apr 2020 15:44:18 +0300
Subject: [PATCH] - Added video mode param to ua_answer() API function.

---
 app/src/main/cpp/baresip.c                             | 7 ++++---
 app/src/main/kotlin/com/tutpro/baresip/Api.kt          | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index ebfc7158..f5fead53 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -1186,7 +1186,8 @@ Java_com_tutpro_baresip_Api_ua_1connect(JNIEnv *env, jobject thiz, jstring javaU
 }
 
 JNIEXPORT jstring JNICALL
-Java_com_tutpro_baresip_Api_ua_1call_1alloc(JNIEnv *env, jobject thiz, jstring javaUA, jstring javaXCall, jint javaVidMode) {
+Java_com_tutpro_baresip_Api_ua_1call_1alloc(JNIEnv *env, jobject thiz, jstring javaUA,
+        jstring javaXCall, jint javaVidMode) {
     struct call *xcall, *call = NULL;
     struct ua *ua;
     int err;
@@ -1212,7 +1213,7 @@ Java_com_tutpro_baresip_Api_ua_1call_1alloc(JNIEnv *env, jobject thiz, jstring j
 
 JNIEXPORT void JNICALL
 Java_com_tutpro_baresip_Api_ua_1answer(JNIEnv *env, jobject thiz, jstring javaUA,
-                                       jstring javaCall) {
+                                       jstring javaCall, jint javaVidMode) {
     const char *native_ua = (*env)->GetStringUTFChars(env, javaUA, 0);
     const char *native_call = (*env)->GetStringUTFChars(env, javaCall, 0);
     LOGD("answering call %s/%s\n", native_ua, native_call);
@@ -1220,7 +1221,7 @@ Java_com_tutpro_baresip_Api_ua_1answer(JNIEnv *env, jobject thiz, jstring javaUA
     struct call *call = (struct call *) strtoul(native_call, NULL, 10);
     play = mem_deref(play);
     re_thread_enter();
-    ua_answer(ua, call);
+    ua_answer(ua, call, (enum vidmode)javaVidMode);
     re_thread_leave();
     (*env)->ReleaseStringUTFChars(env, javaUA, native_ua);
     (*env)->ReleaseStringUTFChars(env, javaCall, native_call);
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Api.kt b/app/src/main/kotlin/com/tutpro/baresip/Api.kt
index f001bd0e..da221b8b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Api.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Api.kt
@@ -21,7 +21,7 @@ object Api {
     external fun ua_connect(uap: String, peer_uri: String, video: Int): String
     external fun ua_hangup(uap: String, callp: String, code: Int, reason: String)
     external fun ua_call_alloc(uap: String, xcallp: String, video: Int): String
-    external fun ua_answer(uap: String, callp: String)
+    external fun ua_answer(uap: String, callp: String, video: Int)
     external fun ua_set_media_af(uap: String, af: Int)
     external fun account_debug(accp: String)
     external fun ua_debug(uap: String)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 20c01c17..75cfac6d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -291,7 +291,7 @@ class MainActivity : AppCompatActivity() {
             Log.d("Baresip", "AoR $aor answering call $callp from ${callUri.text}")
             answerButton.isEnabled = false
             rejectButton.isEnabled = false
-            Api.ua_answer(ua.uap, callp)
+            Api.ua_answer(ua.uap, callp, Api.VIDMODE_OFF)
         }
 
         rejectButton.setOnClickListener {