Changeset 5030 for pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

Timestamp:

Mar 26, 2015 10:06:45 AM (9 years ago)

Author:

nanang

Message:

Re #1790: Misc fixes on renderer viewing in pjsua CLI app sample, e.g: handle NULL surface, handle video disabled, cleanup unused codes.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua.i

@@ -5 +5 @@
 #include "../../pjsua_app.h"
 #include <android/native_window_jni.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-        int pjsuaStart();
-        void pjsuaDestroy();
-        int pjsuaRestart();
-        void setCallbackObject(PjsuaAppCallback* callback);     
-#ifdef __cplusplus
-}
-#endif
 %}
 
@@ -23 +12 @@
 /* Convert Surface object to ANativeWindow for setIncomingVideoRenderer() */
 %typemap(in) jobject surface {
-    $1 = (jobject)ANativeWindow_fromSurface(jenv, $input);
+    $1 = $input? (jobject)ANativeWindow_fromSurface(jenv, $input) : NULL;
 }