X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2FAndroid.mk;h=d6f060b3ca8de502f809394d14a7701cadece5e3;hb=53e9764997e69647290568800a078d6248a09ad5;hp=b66632bb28ec59c7cea65132564c65ad8c8c6a83;hpb=6d59141e9557de7ff95bd5d5b7db5675c90b36b2;p=rtmpclient.git

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index b66632b..d6f060b 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -1,72 +1,115 @@
-LOCAL_PATH := $(call my-dir)
+JNI_PATH := $(call my-dir)
+#include $(JNI_PATH)/libusb-1.0.22/android/jni/Android.mk
+#include $(JNI_PATH)/libuvc-0.0.6/android/jni/Android.mk
+
+include $(JNI_PATH)/libusb/android/jni/Android.mk
+include $(JNI_PATH)/libuvc/android/jni/Android.mk
+
+
+
+#include $(JNI_PATH)/UVCCamera/Android.mk
+#include $(JNI_PATH)/Android2.mk
+
+
+
+##############
+#LOCAL_PATH := $(call my-dir)
+LOCAL_PATH := $(JNI_PATH)
+
+#$(warning $(LOCAL_PATH))
+FFMPEG_DIR := $(abspath $(LOCAL_PATH)/ffmpeg-3.0.11)
+#UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc-0.0.6)
+UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc)
+
+
 
 # avdevice
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavdevice
-LOCAL_SRC_FILES:= lib/libavdevice.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libavdevice.so
+LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # avcodec
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavcodec
-LOCAL_SRC_FILES:= lib/libavcodec.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libavcodec.so
+LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # avformat
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavformat
-LOCAL_SRC_FILES:= lib/libavformat.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libavformat.so
+LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # avfilter
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavfilter
-LOCAL_SRC_FILES:= lib/libavfilter.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libavfilter.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # swresample
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libswresample
-LOCAL_SRC_FILES:= lib/libswresample.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libswresample.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # swscale
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libswscale
-LOCAL_SRC_FILES:= lib/libswscale.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libswscale.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
 # avutil
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libavutil
-LOCAL_SRC_FILES:= lib/libavutil.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libavutil.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
+ifeq ($(TARGET_ARCH),x86)
 # x264
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libx264
-LOCAL_SRC_FILES:= lib/libx264.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libx264.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
+endif
 
 # postproc
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libpostproc
-LOCAL_SRC_FILES:= lib/libpostproc.so
-LOCAL_EXPORT_C_INCLUDES:= $(LOCAL_PATH)/include
+LOCAL_SRC_FILES:= $(FFMPEG_DIR)/lib/$(TARGET_ARCH)/libpostproc.so
+#LOCAL_EXPORT_C_INCLUDES:= $(FFMPEG_DIR)/include
 include $(PREBUILT_SHARED_LIBRARY)
 
+
+
 # ffmpegjni
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := ffmpeg-jni
-LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp
-LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264
-LOCAL_LDLIBS :=-llog
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp \
+                   ai_suanzi_rtmpclient_UVCCamera.cpp \
+                   UVCCamera.cpp
+
+LOCAL_C_INCLUDES := $(UVC_ROOT)/include
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264 uvc
+else
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc uvc
+endif
+LOCAL_CFLAGS := -D__ANDROID_API__=21
+#LOCAL_CFLAGS += -I$(LOCAL_PATH)/../ffmpeg-3.0.11/include
+#LOCAL_CFLAGS += -I$(FFMPEG_DIR)/include
+#LOCAL_CFLAGS += -Ijni/ffmpeg-3.0.11/include
+
+
+LOCAL_LDLIBS :=-llog -landroid
+include $(BUILD_SHARED_LIBRARY)
+