Linphone submodule updated + mjpeg encoder build added

This commit is contained in:
Sylvain Berfini 2012-06-29 10:46:46 +02:00
parent 476abbbf87
commit f8596abb55
6 changed files with 24 additions and 2 deletions

View file

@ -1443,4 +1443,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
super(throwable); super(throwable);
} }
} }
@Override
public void notifyReceived(LinphoneCore lc, LinphoneCall call,
LinphoneAddress from, byte[] event) {
}
} }

View file

@ -155,4 +155,14 @@ class LinphoneCallImpl implements LinphoneCall {
public float getPlayVolume() { public float getPlayVolume() {
return getPlayVolume(nativePtr); 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);
}
} }

View file

@ -724,4 +724,9 @@ class LinphoneCoreImpl implements LinphoneCore {
String username, String password) { String username, String password) {
tunnelSetHttpProxy(nativePtr, proxy_host, port, username, password); tunnelSetHttpProxy(nativePtr, proxy_host, port, username, password);
} }
private native void refreshRegisters(long nativePtr);
public void refreshRegisters() {
refreshRegisters(nativePtr);
}
} }

View file

@ -70,6 +70,7 @@ LOCAL_SRC_FILES = \
libavcodec/jrevdct.c \ libavcodec/jrevdct.c \
libavcodec/mjpeg.c.arm \ libavcodec/mjpeg.c.arm \
libavcodec/mjpegdec.c.arm \ libavcodec/mjpegdec.c.arm \
libavcodec/mjpegenc.c.arm \
libavcodec/motion_est.c.arm \ libavcodec/motion_est.c.arm \
libavcodec/mpeg12data.c \ libavcodec/mpeg12data.c \
libavcodec/mpeg4video.c.arm \ libavcodec/mpeg4video.c.arm \

View file

@ -515,7 +515,7 @@
#define CONFIG_HUFFYUV_ENCODER 0 #define CONFIG_HUFFYUV_ENCODER 0
#define CONFIG_JPEGLS_ENCODER 0 #define CONFIG_JPEGLS_ENCODER 0
#define CONFIG_LJPEG_ENCODER 0 #define CONFIG_LJPEG_ENCODER 0
#define CONFIG_MJPEG_ENCODER 0 #define CONFIG_MJPEG_ENCODER 1
#define CONFIG_MPEG1VIDEO_ENCODER 0 #define CONFIG_MPEG1VIDEO_ENCODER 0
#define CONFIG_MPEG2VIDEO_ENCODER 0 #define CONFIG_MPEG2VIDEO_ENCODER 0
#define CONFIG_MPEG4_ENCODER 1 #define CONFIG_MPEG4_ENCODER 1

@ -1 +1 @@
Subproject commit 9e3835ff16a7f5fdaf02e7e767bb9de01850e487 Subproject commit 9f02a12f4641989a225ee77bf6f403cd1c57d9e6