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

Timestamp:

Mar 26, 2015 10:06:45 AM (10 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.

Location:

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

Files:

• pjsua.i (modified) (2 diffs)
• pjsua_app_callback.cpp (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;
 }
 

pjproject/trunk/pjsip-apps/src/pjsua/android/jni/pjsua_app_callback.cpp

@@ -46 +46 @@
 static void on_call_media_state(pjsua_call_id call_id)
 {
+#if PJMEDIA_HAS_VIDEO
     pjsua_call_info call_info;
     unsigned mi;
-    pj_bool_t has_error = PJ_FALSE;
 
     pjsua_call_get_info(call_id, &call_info);
@@ -68 +68 @@
         }
     }
+#endif
     
     /* Forward to original callback */