Changeset 5014 for pjproject/trunk/pjsip-apps/src/pjsua/android/jni

Timestamp:

Mar 22, 2015 8:53:03 AM (10 years ago)

Author:

nanang

Message:

Re #1790:

• Removed android_opengl_get_surface() for renderer view setup, Java application can directly supply Surface object as renderer window.
• Added renderer view on pjsua CLI app sample.

Location:

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

Files:

• pjsua.i (modified) (2 diffs)
• pjsua_app_callback.cpp (modified) (3 diffs)
• pjsua_app_callback.h (modified) (2 diffs)

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

@@ -4 +4 @@
 #include "pjsua_app_callback.h"
 #include "../../pjsua_app.h"
+#include <android/native_window_jni.h>
 
 #ifdef __cplusplus
@@ -17 +18 @@
 %}
 
-int pjsuaStart();
-void pjsuaDestroy();
-int pjsuaRestart();
-
-/* turn on director wrapping PjsuaAppCallback */
+/* Turn on director wrapping PjsuaAppCallback */
 %feature("director") PjsuaAppCallback;
 
+/* Convert Surface object to ANativeWindow for setIncomingVideoRenderer() */
+%typemap(in) jobject surface {
+    $1 = (jobject)ANativeWindow_fromSurface(jenv, $input);
+}
+
 %include "pjsua_app_callback.h"
-
-void setCallbackObject(PjsuaAppCallback* callback);
-

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

@@ -30 +30 @@
 static int restart_argc;
 static char **restart_argv;
+static pjsua_callback pjsua_cb_orig;
+static jobject callVideoSurface;
 
 extern const char *pjsua_app_def_argv[];
@@ -42 +44 @@
 }
 
+static void on_call_media_state(pjsua_call_id call_id)
+{
+    pjsua_call_info call_info;
+    unsigned mi;
+    pj_bool_t has_error = PJ_FALSE;
+
+    pjsua_call_get_info(call_id, &call_info);
+
+    for (mi=0; mi<call_info.media_cnt; ++mi) {
+        pjsua_call_media_info *med_info = &call_info.media[mi];
+        if (med_info->type == PJMEDIA_TYPE_VIDEO &&
+            med_info->status == PJSUA_CALL_MEDIA_ACTIVE &&
+            med_info->stream.vid.win_in != PJSUA_INVALID_ID)
+        {
+            pjmedia_vid_dev_hwnd vhwnd;
+
+            /* Setup renderer surface */
+            pj_bzero(&vhwnd, sizeof(vhwnd));
+            vhwnd.type = PJMEDIA_VID_DEV_HWND_TYPE_ANDROID;
+            vhwnd.info.window = callVideoSurface;
+            pjsua_vid_win_set_win(med_info->stream.vid.win_in, &vhwnd);
+            break;
+        }
+    }
+    
+    /* Forward to original callback */
+    if (pjsua_cb_orig.on_call_media_state)
+        (*pjsua_cb_orig.on_call_media_state)(call_id);
+}
 
 /** Callback wrapper **/
 static void on_cli_config(pjsua_app_config *cfg)
 {
+    pjsua_cb_orig = cfg->cfg.cb;
     cfg->log_cfg.cb = &log_writer;
+    
+    /* Override pjsua callback, e.g: to install renderer view */
+    cfg->cfg.cb.on_call_media_state = &on_call_media_state;
 }
 
@@ -127 +162 @@
 }
 
+
+void setIncomingVideoRenderer(jobject surface)
+{
+    callVideoSurface = surface;
+}
+
 #endif

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

@@ -20 +20 @@
 #define __PJSUA_APP_CALLBACK_H__
 
+#include <jni.h>
+
 class PjsuaAppCallback {
 public:
@@ -32 +34 @@
 int pjsuaRestart();
 void setCallbackObject(PjsuaAppCallback* callback);
+void setIncomingVideoRenderer(jobject surface);
 }