summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk9
-rw-r--r--[-rwxr-xr-x]CameraHal.cpp4
-rw-r--r--[-rwxr-xr-x]CameraHal_Module.cpp3
-rw-r--r--[-rwxr-xr-x]V4LCameraAdapter/V4LCameraAdapter.cpp142
-rwxr-xr-xinc/mjpeg/colorspaces.h288
-rw-r--r--inc/mjpeg/defs.h57
-rwxr-xr-xinc/mjpeg/huffman.h99
-rwxr-xr-xinc/mjpeg/jutils.h149
-rwxr-xr-xmjpeg/colorspaces.c2016
-rwxr-xr-xmjpeg/jpegdec.c1040
10 files changed, 128 insertions, 3679 deletions
diff --git a/Android.mk b/Android.mk
index b98237a..822195f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,10 +47,6 @@ CAMERA_HAL_VERTURAL_CAMERA_SRC:= \
vircam/VirtualCamHal.cpp \
vircam/AppCbNotifier.cpp \
vircam/V4LCamAdpt.cpp
-
-CAMERA_HAL_JPEG_SRC:=\
- mjpeg/jpegdec.c \
- mjpeg/colorspaces.c
CAMERA_HAL_HW_JPEGENC_SRC:=\
jpegenc_hw/jpegenc.cpp
@@ -62,7 +58,6 @@ LOCAL_SRC_FILES:= \
$(CAMERA_V4L_SRC) \
$(CAMERA_COMMON_SRC) \
$(CAMERA_UTILS_SRC) \
- $(CAMERA_HAL_JPEG_SRC) \
$(CAMERA_USB_FMT_SRC)
ifeq ($(BOARD_HAVE_HW_JPEGENC),true)
@@ -88,6 +83,10 @@ LOCAL_C_INCLUDES += \
system/core/include/utils \
system/core/libion/include/ \
system/core/libion/kernel-headers \
+ external/libyuv/files/include/ \
+
+LOCAL_STATIC_LIBRARIES := \
+ libyuv_static \
ifeq ($(BOARD_HAVE_HW_JPEGENC),true)
LOCAL_C_INCLUDES += \