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/CameraHal_Module.cpp b/CameraHal_Module.cpp
index e32c9c9..4f44f74 100755..100644
--- a/CameraHal_Module.cpp
+++ b/CameraHal_Module.cpp
@@ -101,9 +101,6 @@ camera_module_t HAL_MODULE_INFO_SYM = {
set_callbacks: NULL,
get_vendor_tag_ops: NULL,
open_legacy: NULL,
- set_torch_mode: NULL,
- init: NULL,
- reserved: {0},
};
typedef struct aml_camera_device {