Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added multicore option for MS

Browse source
This commit is contained in:
Sylvain Berfini 2012-03-22 16:50:42 +01:00
parent 12d35a7225
commit 2f7d1473b6
5 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/org/linphone/LinphoneManager.java
View file

@ -469,6 +469,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
mLc.setPlayFile(mPauseSoundFile); mLc.setPlayFile(mPauseSoundFile);
mLc.setVideoPolicy(isAutoInitiateVideoCalls(), isAutoAcceptCamera()); mLc.setVideoPolicy(isAutoInitiateVideoCalls(), isAutoAcceptCamera());
int availableCores = Runtime.getRuntime().availableProcessors();
Log.w("MediaStreamer : " + availableCores + " cores detected and configured");
mLc.setCpuCount(availableCores);
try { try {
initFromConf(); initFromConf();
} catch (LinphoneException e) { } catch (LinphoneException e) {

6
src/org/linphone/core/LinphoneCoreImpl.java
View file

@ -706,4 +706,10 @@ class LinphoneCoreImpl implements LinphoneCore {
public void setUserAgent(String name, String version) { public void setUserAgent(String name, String version) {
setUserAgent(nativePtr,name,version); setUserAgent(nativePtr,name,version);
} }
private native void setCpuCountNative(int count);
public void setCpuCount(int count)
{
setCpuCountNative(count);
}
} }

8
submodules/externals/build/libvpx/Android.mk vendored
View file

@ -86,7 +86,7 @@ VP8_CX_SRCS += vp8/encoder/encodeframe.c
VP8_CX_SRCS += vp8/encoder/encodeintra.c VP8_CX_SRCS += vp8/encoder/encodeintra.c
VP8_CX_SRCS += vp8/encoder/encodemb.c VP8_CX_SRCS += vp8/encoder/encodemb.c
VP8_CX_SRCS += vp8/encoder/encodemv.c VP8_CX_SRCS += vp8/encoder/encodemv.c
#VP8_CX_SRCS += vp8/encoder/ethreading.c VP8_CX_SRCS += vp8/encoder/ethreading.c #
VP8_CX_SRCS += vp8/encoder/generic/csystemdependent.c VP8_CX_SRCS += vp8/encoder/generic/csystemdependent.c
VP8_CX_SRCS += vp8/encoder/lookahead.c VP8_CX_SRCS += vp8/encoder/lookahead.c
VP8_CX_SRCS += vp8/encoder/mcomp.c VP8_CX_SRCS += vp8/encoder/mcomp.c
@ -210,10 +210,10 @@ VP8_DX_SRCS += vp8/decoder/dequantize.c
VP8_DX_SRCS += vp8/decoder/detokenize.c VP8_DX_SRCS += vp8/decoder/detokenize.c
VP8_DX_SRCS += vp8/decoder/error_concealment.c VP8_DX_SRCS += vp8/decoder/error_concealment.c
VP8_DX_SRCS += vp8/decoder/generic/dsystemdependent.c VP8_DX_SRCS += vp8/decoder/generic/dsystemdependent.c
VP8_DX_SRCS += vp8/decoder/reconintra_mt.c #
VP8_DX_SRCS += vp8/decoder/threading.c #
VP8_DX_SRCS += vp8/decoder/onyxd_if.c VP8_DX_SRCS += vp8/decoder/onyxd_if.c
#VP8_DX_SRCS += vp8/decoder/threading.c
VP8_DX_SRCS += vp8/decoder/idct_blk.c VP8_DX_SRCS += vp8/decoder/idct_blk.c
#VP8_DX_SRCS += vp8/decoder/reconintra_mt.c
### vpx_codec ### vpx_codec
API_SRCS = vpx/src/vpx_decoder.c API_SRCS = vpx/src/vpx_decoder.c
@ -235,7 +235,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \ $(LOCAL_PATH) \
$(LOCAL_PATH)/vpx_ports \ $(LOCAL_PATH)/vpx_ports \
$(LOCAL_PATH)/vp8/common \ $(LOCAL_PATH)/vp8/common \
$(LOCAL_PATH)/vp8/encoder \ $(LOCAL_PATH)/vp8/encoder \
$(LOCAL_PATH)/vp8/decoder \ $(LOCAL_PATH)/vp8/decoder \

2
submodules/externals/build/libvpx/vpx_config.h vendored
View file

@ -51,7 +51,7 @@
#define CONFIG_DC_RECON 0 #define CONFIG_DC_RECON 0
#define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_RUNTIME_CPU_DETECT 1
#define CONFIG_POSTPROC 0 #define CONFIG_POSTPROC 0
#define CONFIG_MULTITHREAD 0 #define CONFIG_MULTITHREAD 1
#define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTERNAL_STATS 0
#define CONFIG_VP8_ENCODER 1 #define CONFIG_VP8_ENCODER 1
#define CONFIG_VP8_DECODER 1 #define CONFIG_VP8_DECODER 1

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7f873403bf99fd29ae6c6d5ed957522ac69d60f6 Subproject commit 0a21e2c322aad67fe75a6f42d6c7dd535946dfff