diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2015-03-18 08:25:24 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2015-03-18 08:25:24 +0000 |
| commit | 18061c77b205207a29aeb61414c1040affeeae3b (patch) | |
| tree | 51168f9aeb7c4ea275586c7e4c9acbefa571e9aa /pjsip-apps | |
| parent | 0266873461cbbaeac7cc5a210fa90bab6c640b65 (diff) | |
Re #1823 (PJSUA2 Video API): Add Pjsua2 Video Window API and Pjsua API to set output window
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4996 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 1 | ||||
| -rw-r--r-- | pjsip-apps/src/swig/pjsua2.i | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index b72f6ee1..f24bdddd 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -137,6 +137,7 @@ else MY_JNI_CFLAGS += -fPIC ifeq ($(OS),android) MY_JNI_CFLAGS+= -D__ANDROID__ + SWIG_FLAGS+= -D__ANDROID__ endif endif diff --git a/pjsip-apps/src/swig/pjsua2.i b/pjsip-apps/src/swig/pjsua2.i index ae76bd51..91f91916 100644 --- a/pjsip-apps/src/swig/pjsua2.i +++ b/pjsip-apps/src/swig/pjsua2.i @@ -102,6 +102,15 @@ using namespace pj; %template(CodecInfoVector) std::vector<pj::CodecInfo*>; %include "pjsua2/media.hpp" +// Create an interface for android_opengl_get_surface() +#if defined(SWIGJAVA) && defined(__ANDROID__) +%inline %{ +extern "C" { + void* android_opengl_get_surface(jobject surface); +} +%} +#endif + %include "pjsua2/presence.hpp" %include "pjsua2/account.hpp" %include "pjsua2/call.hpp" |