Commit ab14e9c7 authored by Simon Morlat's avatar Simon Morlat
Browse files

android compilation

parent 6701e074
......@@ -81,31 +81,23 @@ endif
##if BUILD_MACAQSND
#LOCAL_SRC_FILES += aqsnd.c
##if BUILD_VIDEO
#
##if BUILD_MACOSX
#LOCAL_SRC_FILES += msv4m.c
#
## else (Linux)
#LOCAL_SRC_FILES += \
# msv4l.c \
# msv4l2.c
#
ifeq ($(LINPHONE_VIDEO),1)
#LOCAL_SRC_FILES += \
# videoenc.c \
# videodec.c \
# pixconv.c \
# sizeconv.c \
# rfc2429.h \
# nowebcam.c \
# nowebcam.h \
# videoout.c \
# msvideo.c \
# rfc3984.c \
# mire.c \
# swscale.h \
# ffmpeg-priv.h
LOCAL_CFLAGS += -DVIDEO_ENABLED
LOCAL_SRC_FILES += \
videoenc.c \
videodec.c \
pixconv.c \
sizeconv.c \
nowebcam.c \
msvideo.c \
h264dec.c \
rfc3984.c \
mire.c \
videostream.c
endif
#LOCAL_SRC_FILES += videostream.c
#
......@@ -125,10 +117,6 @@ LOCAL_CFLAGS += \
-include $(LOCAL_PATH)/../build/android/libmediastreamer2_AndroidConfig.h \
-D_POSIX_SOURCE
ifeq ($(TARGET_ARCH),arm)
#this is for ffmpeg
LOCAL_CFLAGS += -DANDROID_CONFIG_X86=1
endif
#LOCAL_CFLAGS += -DDEBUG
......@@ -140,22 +128,20 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../../externals/speex/include \
$(LOCAL_PATH)/../../../externals/build/speex \
$(LOCAL_PATH)/../../../externals/gsm/inc \
$(LOCAL_PATH)/../../../externals/ffmpeg
$(LOCAL_PATH)/../../../externals/ffmpeg \
$(LOCAL_PATH)/../../../externals/ \
$(LOCAL_PATH)/../../../externals/build/ffmpeg
LOCAL_STATIC_LIBRARIES := \
libortp \
libspeex \
libspeex
ifeq ($(strip $(BOARD_USES_ALSA_AUDIO)),true)
LOCAL_SHARED_LIBRARIES += libasound
endif
#LOCAL_SHARED_LIBRARIES += libavcodec \
# libswscale \
# libavutil
include $(BUILD_STATIC_LIBRARY)
......@@ -25,6 +25,13 @@ extern MSFilterDesc aq_write_desc;
extern MSFilterDesc ms_equalizer_desc;
extern MSFilterDesc ms_gsm_dec_desc;
extern MSFilterDesc ms_gsm_enc_desc;
extern MSFilterDesc ms_mpeg4_enc_desc;
extern MSFilterDesc ms_mpeg4_dec_desc;
extern MSFilterDesc ms_h263_enc_desc;
extern MSFilterDesc ms_h263_dec_desc;
extern MSFilterDesc ms_h264_dec_desc;
extern MSFilterDesc ms_pix_conv_desc;
extern MSFilterDesc ms_size_conv_desc;
MSFilterDesc * ms_filter_descs[]={
&ms_alaw_dec_desc,
......@@ -49,6 +56,15 @@ MSFilterDesc * ms_filter_descs[]={
&ms_equalizer_desc,
&ms_gsm_enc_desc,
&ms_gsm_dec_desc,
#ifdef VIDEO_ENABLED
&ms_mpeg4_enc_desc,
&ms_mpeg4_dec_desc,
&ms_h263_enc_desc,
&ms_h263_dec_desc,
&ms_h264_dec_desc,
&ms_pix_conv_desc,
&ms_size_conv_desc,
#endif
NULL
};
......@@ -38,10 +38,10 @@
#define HAVE_LIBSWSCALE_SWSCALE_H 1
/* Define to 1 if you have the <linux/videodev2.h> header file. */
#define HAVE_LINUX_VIDEODEV2_H 1
/*#define HAVE_LINUX_VIDEODEV2_H 1 */
/* Define to 1 if you have the <linux/videodev.h> header file. */
#define HAVE_LINUX_VIDEODEV_H 1
/*#define HAVE_LINUX_VIDEODEV_H 1 */
/* Define to 1 if you have the <machine/soundcard.h> header file. */
/* #undef HAVE_MACHINE_SOUNDCARD_H */
......
......@@ -483,7 +483,7 @@ NULL
#ifdef VIDEO_ENABLED
#ifdef __linux
#ifdef HAVE_LINUX_VIDEODEV_H
extern MSWebCamDesc v4l_desc;
#endif
......@@ -516,7 +516,7 @@ static MSWebCamDesc * ms_web_cam_descs[]={
#ifdef HAVE_LINUX_VIDEODEV2_H
&v4l2_card_desc,
#endif
#ifdef __linux
#ifdef HAVE_LINUX_VIDEODEV_H
&v4l_desc,
#endif
#if defined(WIN32) && defined(HAVE_VFW)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment