Changeset 5014 for pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

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.

File:

• pjproject/trunk/pjsip-apps/src/swig/pjsua2.i (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/swig/pjsua2.i

@@ -102 +102 @@
 %template(CodecInfoVector)              std::vector<pj::CodecInfo*>;
 
-%include "pjsua2/media.hpp"
-// Create an interface for android_opengl_get_surface()
+/* pj::WindowHandle::setWindow() receives Surface object */
 #if defined(SWIGJAVA) && defined(__ANDROID__)
-%inline %{
-extern "C" {
-    void* android_opengl_get_surface(jobject surface);
+%{#include <android/native_window_jni.h>%}
+%ignore pj::WindowHandle::display;
+%ignore pj::WindowHandle::window;
+%typemap(in) jobject surface {
+    $1 = (jobject)ANativeWindow_fromSurface(jenv, $input);
 }
-%}
+%extend pj::WindowHandle {
+    void setWindow(jobject surface) { $self->window = surface; }
+}
 #endif
 
+%include "pjsua2/media.hpp"
 %include "pjsua2/presence.hpp"
 %include "pjsua2/account.hpp"