From f8596abb55688884801137de5e2e01bb1600b27c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 29 Jun 2012 10:46:46 +0200 Subject: [PATCH] Linphone submodule updated + mjpeg encoder build added --- src/org/linphone/LinphoneManager.java | 6 ++++++ src/org/linphone/core/LinphoneCallImpl.java | 10 ++++++++++ src/org/linphone/core/LinphoneCoreImpl.java | 5 +++++ .../externals/build/ffmpeg/Android_libavcodec.mk | 1 + submodules/externals/build/ffmpeg/config.h | 2 +- submodules/linphone | 2 +- 6 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 62f226aef..ff80a9a02 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1443,4 +1443,10 @@ public final class LinphoneManager implements LinphoneCoreListener { super(throwable); } } + + @Override + public void notifyReceived(LinphoneCore lc, LinphoneCall call, + LinphoneAddress from, byte[] event) { + + } } diff --git a/src/org/linphone/core/LinphoneCallImpl.java b/src/org/linphone/core/LinphoneCallImpl.java index 008b19df4..5d886d43e 100644 --- a/src/org/linphone/core/LinphoneCallImpl.java +++ b/src/org/linphone/core/LinphoneCallImpl.java @@ -155,4 +155,14 @@ class LinphoneCallImpl implements LinphoneCall { public float getPlayVolume() { return getPlayVolume(nativePtr); } + + private native void takeSnapshot(long nativePtr, String path); + public void takeSnapshot(String path) { + takeSnapshot(nativePtr, path); + } + + private native void zoomVideo(long nativePtr, float factor, float cx, float cy); + public void zoomVideo(float factor, float cx, float cy) { + zoomVideo(nativePtr, factor, cx, cy); + } } diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java index f732782d9..88084d237 100644 --- a/src/org/linphone/core/LinphoneCoreImpl.java +++ b/src/org/linphone/core/LinphoneCoreImpl.java @@ -724,4 +724,9 @@ class LinphoneCoreImpl implements LinphoneCore { String username, String password) { tunnelSetHttpProxy(nativePtr, proxy_host, port, username, password); } + + private native void refreshRegisters(long nativePtr); + public void refreshRegisters() { + refreshRegisters(nativePtr); + } } diff --git a/submodules/externals/build/ffmpeg/Android_libavcodec.mk b/submodules/externals/build/ffmpeg/Android_libavcodec.mk index ef2de0ac0..dab39a7e8 100755 --- a/submodules/externals/build/ffmpeg/Android_libavcodec.mk +++ b/submodules/externals/build/ffmpeg/Android_libavcodec.mk @@ -70,6 +70,7 @@ LOCAL_SRC_FILES = \ libavcodec/jrevdct.c \ libavcodec/mjpeg.c.arm \ libavcodec/mjpegdec.c.arm \ + libavcodec/mjpegenc.c.arm \ libavcodec/motion_est.c.arm \ libavcodec/mpeg12data.c \ libavcodec/mpeg4video.c.arm \ diff --git a/submodules/externals/build/ffmpeg/config.h b/submodules/externals/build/ffmpeg/config.h index 7a9591f6a..86eb0bae3 100644 --- a/submodules/externals/build/ffmpeg/config.h +++ b/submodules/externals/build/ffmpeg/config.h @@ -515,7 +515,7 @@ #define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0 #define CONFIG_LJPEG_ENCODER 0 -#define CONFIG_MJPEG_ENCODER 0 +#define CONFIG_MJPEG_ENCODER 1 #define CONFIG_MPEG1VIDEO_ENCODER 0 #define CONFIG_MPEG2VIDEO_ENCODER 0 #define CONFIG_MPEG4_ENCODER 1 diff --git a/submodules/linphone b/submodules/linphone index 9e3835ff1..9f02a12f4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9e3835ff16a7f5fdaf02e7e767bb9de01850e487 +Subproject commit 9f02a12f4641989a225ee77bf6f403cd1c57d9e6