From 2d6ba43328eabbe5baee7b7753a95c1ac6944395 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 2 Dec 2013 15:58:27 +0100 Subject: [PATCH] enable mjpeg enc/dec from ffmpeg --- Makefile | 2 +- src/org/linphone/KeepAliveHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c9b1a3879..8b3b99e09 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ FFMPEG_BUILD_DIR=$(TOPDIR)/submodules/externals/build/ffmpeg FFMPEG_CONFIGURE_OPTIONS=--target-os=linux --enable-cross-compile --enable-runtime-cpudetect \ --disable-everything --disable-doc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver \ --disable-avdevice --disable-avfilter --disable-avformat --disable-swresample --disable-network \ - --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \ + --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 --enable-decoder=h264 \ --disable-static --enable-shared FFMPEG_ARM_CONFIGURE_OPTIONS=--build-suffix=-linphone-arm --arch=arm --sysroot=$(ARM_SYSROOT) --cross-prefix=$(ARM_TOOLCHAIN_PATH) --enable-pic FFMPEG_X86_CONFIGURE_OPTIONS=--build-suffix=-linphone-x86 --arch=x86 --sysroot=$(X86_SYSROOT) --cross-prefix=$(X86_TOOLCHAIN_PATH) --disable-mmx --disable-sse2 --disable-ssse3 --extra-cflags='-O3' diff --git a/src/org/linphone/KeepAliveHandler.java b/src/org/linphone/KeepAliveHandler.java index 4aca33c7d..5f674893d 100644 --- a/src/org/linphone/KeepAliveHandler.java +++ b/src/org/linphone/KeepAliveHandler.java @@ -34,9 +34,9 @@ public class KeepAliveHandler extends BroadcastReceiver { LinphoneManager.getLc().refreshRegisters(); //make sure iterate will have enough time, device will not sleep until exit from this method try { - Thread.sleep(10000); + Thread.sleep(2000); } catch (InterruptedException e) { - Log.e("Cannot sleep for 10s", e); + Log.e("Cannot sleep for 2s", e); } }