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-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
#$(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-0.0.6)
+UVC_DIR := $(abspath $(LOCAL_PATH)/libuvc)
# ffmpegjni
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := ffmpeg-jni
+#LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp
+#LOCAL_C_INCLUDES := $(UVC_ROOT)/include
+#ifeq ($(TARGET_ARCH),x86)
+#LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264
+#else
+#LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc
+#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)
+
+# FfmpegHelperJNI
include $(CLEAR_VARS)
-LOCAL_MODULE := ffmpeg-jni
-LOCAL_SRC_FILES := ai_suanzi_rtmpclient_Ffmpeg.cpp \
- ai_suanzi_rtmpclient_UVCCamera.cpp \
- UVCCamera.cpp
+LOCAL_MODULE := FfmpegHelperJNI
+LOCAL_SRC_FILES := ai_suanzi_rtmpclient_FfmpegHelper.cpp \
+ FfmpegHelper.cpp
LOCAL_C_INCLUDES := $(UVC_ROOT)/include
ifeq ($(TARGET_ARCH),x86)
-LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264 uvc
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc x264
else
-LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc uvc
+LOCAL_SHARED_LIBRARIES := avdevice avcodec avformat avfilter swresample swscale avutil postproc
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_CFLAGS := -D__ANDROID_API__=21
LOCAL_LDLIBS :=-llog -landroid
include $(BUILD_SHARED_LIBRARY)