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

add ffmpeg compilation

Browse source
This commit is contained in:
Jehan Monnier 2010-10-04 10:38:11 +02:00
parent 6dd69d677c
commit cdfec8dbc5
7 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -19,3 +19,9 @@
[submodule "submodules/libilbc-rfc3951"] [submodule "submodules/libilbc-rfc3951"]
path = submodules/libilbc-rfc3951 path = submodules/libilbc-rfc3951
url = git://git.linphone.org/libilbc-rfc3951.git url = git://git.linphone.org/libilbc-rfc3951.git
[submodule "submodules/externals/ffmpeg"]
path = submodules/externals/ffmpeg
url = git://git.ffmpeg.org/ffmpeg
[submodule "submodules/externals/libswscale"]
path = submodules/externals/libswscale
url = git://git.ffmpeg.org/libswscale

4
jni/Android.mk
View file

@ -14,11 +14,11 @@ include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(root-dir)/submodules/msilbc/Android.mk include $(root-dir)/submodules/msilbc/Android.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk
endif endif
include $(root-dir)/submodules/linphone/build/android/Android.mk include $(root-dir)/submodules/linphone/build/android/Android.mk

6
jni/Application.mk
View file

@ -1,7 +1,9 @@
APP_PROJECT_PATH := $(call my-dir)/../ APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2 liblinphone
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc APP_MODULES +=libmsilbc libavutil libavcodec libswscale
endif endif
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
APP_PLATFORM := android-3 APP_PLATFORM := android-3

16
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -6,21 +6,21 @@ LOCAL_MODULE := libavcodec
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \
libavcodec/allcodecs.c \ libavcodec/allcodecs.c \
libavcodec/aandcttab.c \ libavcodec/aandcttab.c \
libavcodec/arm/dsputil_arm.s.arm \ libavcodec/arm/dsputil_arm.S.arm \
libavcodec/arm/dsputil_armv6.s.arm \ libavcodec/arm/dsputil_armv6.S.arm \
libavcodec/arm/dsputil_init_arm.c \ libavcodec/arm/dsputil_init_arm.c \
libavcodec/arm/dsputil_init_armv5te.c \ libavcodec/arm/dsputil_init_armv5te.c \
libavcodec/arm/dsputil_init_armv6.c \ libavcodec/arm/dsputil_init_armv6.c \
libavcodec/arm/fft_init_arm.c \ libavcodec/arm/fft_init_arm.c \
libavcodec/arm/h264dsp_init_arm.c \ libavcodec/arm/h264dsp_init_arm.c \
libavcodec/arm/h264pred_init_arm.c \ libavcodec/arm/h264pred_init_arm.c \
libavcodec/arm/jrevdct_arm.s \ libavcodec/arm/jrevdct_arm.S \
libavcodec/arm/mpegvideo_arm.s \ libavcodec/arm/mpegvideo_arm.c \
libavcodec/arm/mpegvideo_armv5te.c \ libavcodec/arm/mpegvideo_armv5te.c \
libavcodec/arm/mpegvideo_armv5te_s.S \ libavcodec/arm/mpegvideo_armv5te_s.S \
libavcodec/arm/simple_idct_arm.s \ libavcodec/arm/simple_idct_arm.S \
libavcodec/arm/simple_idct_armv5te.s \ libavcodec/arm/simple_idct_armv5te.S \
libavcodec/arm/simple_idct_armv6.s \ libavcodec/arm/simple_idct_armv6.S \
libavcodec/audioconvert.c.arm \ libavcodec/audioconvert.c.arm \
libavcodec/avpacket.c \ libavcodec/avpacket.c \
libavcodec/bitstream.c \ libavcodec/bitstream.c \
@ -74,11 +74,13 @@ LOCAL_SRC_FILES = \
libavcodec/utils.c libavcodec/utils.c
#LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H -Wa,-I$(LOCAL_PATH)/libavcodec/arm
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../build/ffmpeg \ $(LOCAL_PATH)/../build/ffmpeg \
$(LOCAL_PATH)/libavcodec/arm \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/libavutil $(LOCAL_PATH)/libavutil

16
submodules/externals/build/ffmpeg/Android_libswscale.mk vendored
View file

@ -1,19 +1,21 @@
##lib swcale################### ##lib swcale###################
LOCAL_PATH:= $(call my-dir)../../ffmpeg/ LOCAL_PATH:= $(call my-dir)/../../libswscale/
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libswscale LOCAL_MODULE := libswscale
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \
libswscale/options.c \ options.c \
libswscale/rgb2rgb.c \ rgb2rgb.c \
libswscale/swscale.c \ swscale.c \
libswscale/utils.c \ utils.c \
libswscale/yuv2rgb.c yuv2rgb.c
LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += $(call my-dir)/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \
$(LOCAL_PATH)/../ffmpeg \
$(LOCAL_PATH)/
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

1
submodules/externals/ffmpeg vendored Submodule

@ -0,0 +1 @@
Subproject commit 76393d0b78fd47857fd7bd27756945c1bb021efd

1
submodules/externals/libswscale vendored Submodule

@ -0,0 +1 @@
Subproject commit fae6720e516a0c1448a22b4a5cbc67e6819c965e