diff options
| author | Riza Sulistyo <riza@teluu.com> | 2016-07-20 06:55:11 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2016-07-20 06:55:11 +0000 |
| commit | 589db6637e559d995708f29bbb5499dbf8f48740 (patch) | |
| tree | f175f75ec7a2cc092e79fc38baeaede0725f41ba /pjsip-apps | |
| parent | ff4597cc8e2ee09f8b70fdaffdbc2ee1d1e7b224 (diff) | |
Re #1944: Allow native window to be set for video output window on SDL
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5392 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
| -rw-r--r-- | pjsip-apps/src/swig/java/sample.java | 17 | ||||
| -rw-r--r-- | pjsip-apps/src/swig/pjsua2.i | 9 |
2 files changed, 22 insertions, 4 deletions
diff --git a/pjsip-apps/src/swig/java/sample.java b/pjsip-apps/src/swig/java/sample.java index 7f77dd2c..974e130d 100644 --- a/pjsip-apps/src/swig/java/sample.java +++ b/pjsip-apps/src/swig/java/sample.java @@ -84,8 +84,21 @@ public class sample { private static MyApp app = new MyApp(); private static MyAppObserver observer = new MyObserver(); private static MyAccount account = null; - private static AccountConfig accCfg = null; - + private static AccountConfig accCfg = null; + + // Snippet code to set native window to output video + /* + private void setOutputVidWin() {} + VideoWindowHandle vidWH = new VideoWindowHandle(); + vidWH.getHandle().setWindow(getNativeWindow()); + try { + currentCall.vidWin.setWindow(vidWH); + } catch (Exception e) { + System.out.println(e); + } + } + */ + private static void runWorker() { try { app.init(observer, ".", true); diff --git a/pjsip-apps/src/swig/pjsua2.i b/pjsip-apps/src/swig/pjsua2.i index 53bd06da..51616a72 100644 --- a/pjsip-apps/src/swig/pjsua2.i +++ b/pjsip-apps/src/swig/pjsua2.i @@ -114,6 +114,9 @@ using namespace pj; %template(VideoDevInfoVector) std::vector<pj::VideoDevInfo*>; %template(CodecFmtpVector) std::vector<pj::CodecFmtp>; +%ignore pj::WindowHandle::display; +%ignore pj::WindowHandle::window; + /* pj::WindowHandle::setWindow() receives Surface object */ #if defined(SWIGJAVA) && defined(__ANDROID__) %{ @@ -123,14 +126,16 @@ using namespace pj; # define ANativeWindow_fromSurface(a,b) NULL #endif %} -%ignore pj::WindowHandle::display; -%ignore pj::WindowHandle::window; %typemap(in) jobject surface { $1 = ($input? (jobject)ANativeWindow_fromSurface(jenv, $input): NULL); } %extend pj::WindowHandle { void setWindow(jobject surface) { $self->window = surface; } } +#else +%extend pj::WindowHandle { + void setWindow(long long hwnd) { $self->window = (void*)hwnd; } +} #endif %include "pjsua2/media.hpp" |