universal7904: camera: Add empty camera wrapper
Changes by J.C.:
1. Always direct open to Camera3.
2. Redirect open_legacy to Camera2.
3. Add fixup metadata function for Camera3.
Change-Id: Ifa7a77ff5a9eb903cf2146d8ce8c7d6a64a6da4c
Signed-off-by: Jesse Chan <jc@lineageos.org>
diff --git a/extract-files.sh b/extract-files.sh
index 0f20e0a..2a23597 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -25,7 +25,7 @@
vendor/lib*/libhifills.so)
grep -q libunwindstack.so "$2" || "$PATCHELF" --add-needed "libunwindstack.so" "$2"
;;
- vendor/lib*/hw/camera.exynos7904.so)
+ vendor/lib*/hw/camera.vendor.exynos7904.so)
"$PATCHELF" --replace-needed "libcamera_client.so" "libcamera_metadata_helper.so" "$2"
"$PATCHELF" --replace-needed "libgui.so" "libgui_vendor.so" "$2"
;;
diff --git a/hardware/camera/Android.mk b/hardware/camera/Android.mk
new file mode 100644
index 0000000..296b57d
--- /dev/null
+++ b/hardware/camera/Android.mk
@@ -0,0 +1,21 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ CameraWrapper.cpp \
+ Camera2Wrapper.cpp \
+ Camera3Wrapper.cpp
+
+LOCAL_STATIC_LIBRARIES := libbase libarect
+LOCAL_SHARED_LIBRARIES := \
+ libhardware liblog libcamera_client libutils libcutils \
+ android.hidl.token@1.0-utils \
+ android.hardware.graphics.bufferqueue@1.0
+
+LOCAL_HEADER_LIBRARIES := libnativebase_headers
+
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE := camera.exynos7904
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/hardware/camera/Camera2Wrapper.cpp b/hardware/camera/Camera2Wrapper.cpp
new file mode 100644
index 0000000..03e95a2
--- /dev/null
+++ b/hardware/camera/Camera2Wrapper.cpp
@@ -0,0 +1,494 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_PARAMETERS
+
+#define LOG_TAG "Camera2Wrapper"
+#include <cutils/log.h>
+
+#include "CameraWrapper.h"
+#include "Camera2Wrapper.h"
+
+typedef struct wrapper_camera2_device {
+ camera_device_t base;
+ int id;
+ camera_device_t *vendor;
+} wrapper_camera2_device_t;
+
+#define VENDOR_CALL(device, func, ...) ({ \
+ wrapper_camera2_device_t *__wrapper_dev = (wrapper_camera2_device_t*) device; \
+ __wrapper_dev->vendor->ops->func(__wrapper_dev->vendor, ##__VA_ARGS__); \
+})
+
+#define CAMERA_ID(device) (((wrapper_camera2_device_t *)(device))->id)
+
+static camera_module_t *gVendorModule = 0;
+
+static int check_vendor_module()
+{
+ int rv = 0;
+ ALOGV("%s", __FUNCTION__);
+
+ if(gVendorModule)
+ return 0;
+
+ rv = hw_get_module_by_class("camera", "vendor", (const hw_module_t **)&gVendorModule);
+ if (rv)
+ ALOGE("failed to open vendor camera module");
+ return rv;
+}
+
+/*******************************************************************
+ * Camera2 wrapper fixup functions
+ *******************************************************************/
+
+static char * camera2_fixup_getparams(int id __unused, const char * settings)
+{
+ bool videoMode = false;
+ const char* isoMode;
+ char *manipBuf;
+
+ android::CameraParameters params;
+ params.unflatten(android::String8(settings));
+
+#ifdef LOG_PARAMETERS
+ ALOGV("%s: Original parameters:", __FUNCTION__);
+ params.dump();
+#endif
+
+#ifdef LOG_PARAMETERS
+ ALOGV("%s: Fixed parameters:", __FUNCTION__);
+ params.dump();
+#endif
+
+ android::String8 strParams = params.flatten();
+ char *ret = strdup(strParams.string());
+
+ return ret;
+}
+
+static char * camera2_fixup_setparams(int id __unused, const char * settings)
+{
+ bool videoMode = false;
+ const char* isoMode;
+
+ android::CameraParameters params;
+ params.unflatten(android::String8(settings));
+
+#ifdef LOG_PARAMETERS
+ ALOGV("%s: Original parameters:", __FUNCTION__);
+ params.dump();
+#endif
+
+#ifdef LOG_PARAMETERS
+ ALOGV("%s: Fixed parameters:", __FUNCTION__);
+ params.dump();
+#endif
+
+ android::String8 strParams = params.flatten();
+ char *ret = strdup(strParams.string());
+
+ return ret;
+}
+
+/*******************************************************************
+ * implementation of camera_device_ops functions
+ *******************************************************************/
+
+static int camera2_set_preview_window(struct camera_device * device,
+ struct preview_stream_ops *window)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, set_preview_window, window);
+}
+
+static void camera2_set_callbacks(struct camera_device * device,
+ camera_notify_callback notify_cb,
+ camera_data_callback data_cb,
+ camera_data_timestamp_callback data_cb_timestamp,
+ camera_request_memory get_memory,
+ void *user)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, set_callbacks, notify_cb, data_cb, data_cb_timestamp, get_memory, user);
+}
+
+static void camera2_enable_msg_type(struct camera_device * device, int32_t msg_type)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, enable_msg_type, msg_type);
+}
+
+static void camera2_disable_msg_type(struct camera_device * device, int32_t msg_type)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, disable_msg_type, msg_type);
+}
+
+static int camera2_msg_type_enabled(struct camera_device * device, int32_t msg_type)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return 0;
+
+ return VENDOR_CALL(device, msg_type_enabled, msg_type);
+}
+
+static int camera2_start_preview(struct camera_device * device)
+{
+ int rc = 0;
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, start_preview);
+}
+
+static void camera2_stop_preview(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, stop_preview);
+}
+
+static int camera2_preview_enabled(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, preview_enabled);
+}
+
+static int camera2_store_meta_data_in_buffers(struct camera_device * device, int enable)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, store_meta_data_in_buffers, enable);
+}
+
+static int camera2_start_recording(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, start_recording);
+}
+
+static void camera2_stop_recording(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, stop_recording);
+}
+
+static int camera2_recording_enabled(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, recording_enabled);
+}
+
+static void camera2_release_recording_frame(struct camera_device * device,
+ const void *opaque)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, release_recording_frame, opaque);
+}
+
+static int camera2_auto_focus(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, auto_focus);
+}
+
+static int camera2_cancel_auto_focus(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, cancel_auto_focus);
+}
+
+static int camera2_take_picture(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, take_picture);
+}
+
+static int camera2_cancel_picture(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, cancel_picture);
+}
+
+static int camera2_set_parameters(struct camera_device * device, const char *params)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ char *tmp = NULL;
+ tmp = camera2_fixup_setparams(CAMERA_ID(device), params);
+
+ int ret = VENDOR_CALL(device, set_parameters, tmp);
+
+ return ret;
+}
+
+static char* camera2_get_parameters(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return NULL;
+
+ char* params = VENDOR_CALL(device, get_parameters);
+
+ char * tmp = camera2_fixup_getparams(CAMERA_ID(device), params);
+ VENDOR_CALL(device, put_parameters, params);
+ params = tmp;
+
+ return params;
+}
+
+static void camera2_put_parameters(struct camera_device *device, char *params)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(params)
+ free(params);
+}
+
+static int camera2_send_command(struct camera_device * device,
+ int32_t cmd, int32_t arg1, int32_t arg2)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, send_command, cmd, arg1, arg2);
+}
+
+static void camera2_release(struct camera_device * device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return;
+
+ VENDOR_CALL(device, release);
+}
+
+static int camera2_dump(struct camera_device * device, int fd)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device, (uintptr_t)(((wrapper_camera2_device_t*)device)->vendor));
+
+ if(!device)
+ return -EINVAL;
+
+ return VENDOR_CALL(device, dump, fd);
+}
+
+static int camera2_device_close(hw_device_t* device)
+{
+ int ret = 0;
+ wrapper_camera2_device_t *wrapper_dev = NULL;
+
+ ALOGV("%s", __FUNCTION__);
+
+ android::Mutex::Autolock lock(gCameraWrapperLock);
+
+ if (!device) {
+ ret = -EINVAL;
+ goto done;
+ }
+
+ wrapper_dev = (wrapper_camera2_device_t*) device;
+
+ wrapper_dev->vendor->common.close((hw_device_t*)wrapper_dev->vendor);
+ if (wrapper_dev->base.ops)
+ free(wrapper_dev->base.ops);
+ free(wrapper_dev);
+done:
+ return ret;
+}
+
+/*******************************************************************
+ * implementation of camera_module functions
+ *******************************************************************/
+
+/* open device handle to one of the cameras
+ *
+ * assume camera service will keep singleton of each camera
+ * so this function will always only be called once per camera instance
+ */
+
+int camera2_device_open(const hw_module_t* module, const char* name,
+ hw_device_t** device)
+{
+ int rv = 0;
+ int num_cameras = 0;
+ int cameraid;
+ wrapper_camera2_device_t* camera2_device = NULL;
+ camera_device_ops_t* camera2_ops = NULL;
+
+ android::Mutex::Autolock lock(gCameraWrapperLock);
+
+ ALOGV("%s", __FUNCTION__);
+
+ if (name != NULL) {
+ if (check_vendor_module())
+ return -EINVAL;
+
+ cameraid = atoi(name);
+ num_cameras = gVendorModule->get_number_of_cameras();
+
+ if (cameraid > num_cameras) {
+ ALOGE("camera service provided cameraid out of bounds, "
+ "cameraid = %d, num supported = %d",
+ cameraid, num_cameras);
+ rv = -EINVAL;
+ goto fail;
+ }
+
+ camera2_device = (wrapper_camera2_device_t*)malloc(sizeof(*camera2_device));
+ if (!camera2_device) {
+ ALOGE("camera2_device allocation fail");
+ rv = -ENOMEM;
+ goto fail;
+ }
+ memset(camera2_device, 0, sizeof(*camera2_device));
+ camera2_device->id = cameraid;
+
+ rv = gVendorModule->open_legacy((const hw_module_t*)gVendorModule, name, CAMERA_DEVICE_API_VERSION_1_0, (hw_device_t**)&(camera2_device->vendor));
+ if (rv)
+ {
+ ALOGE("vendor camera open fail");
+ goto fail;
+ }
+ ALOGV("%s: got vendor camera device 0x%08X", __FUNCTION__, (uintptr_t)(camera2_device->vendor));
+
+ camera2_ops = (camera_device_ops_t*)malloc(sizeof(*camera2_ops));
+ if (!camera2_ops) {
+ ALOGE("camera_ops allocation fail");
+ rv = -ENOMEM;
+ goto fail;
+ }
+
+ memset(camera2_ops, 0, sizeof(*camera2_ops));
+
+ camera2_device->base.common.tag = HARDWARE_DEVICE_TAG;
+ camera2_device->base.common.version = CAMERA_DEVICE_API_VERSION_1_0;
+ camera2_device->base.common.module = (hw_module_t *)(module);
+ camera2_device->base.common.close = camera2_device_close;
+ camera2_device->base.ops = camera2_ops;
+
+ camera2_ops->set_preview_window = camera2_set_preview_window;
+ camera2_ops->set_callbacks = camera2_set_callbacks;
+ camera2_ops->enable_msg_type = camera2_enable_msg_type;
+ camera2_ops->disable_msg_type = camera2_disable_msg_type;
+ camera2_ops->msg_type_enabled = camera2_msg_type_enabled;
+ camera2_ops->start_preview = camera2_start_preview;
+ camera2_ops->stop_preview = camera2_stop_preview;
+ camera2_ops->preview_enabled = camera2_preview_enabled;
+ camera2_ops->store_meta_data_in_buffers = camera2_store_meta_data_in_buffers;
+ camera2_ops->start_recording = camera2_start_recording;
+ camera2_ops->stop_recording = camera2_stop_recording;
+ camera2_ops->recording_enabled = camera2_recording_enabled;
+ camera2_ops->release_recording_frame = camera2_release_recording_frame;
+ camera2_ops->auto_focus = camera2_auto_focus;
+ camera2_ops->cancel_auto_focus = camera2_cancel_auto_focus;
+ camera2_ops->take_picture = camera2_take_picture;
+ camera2_ops->cancel_picture = camera2_cancel_picture;
+ camera2_ops->set_parameters = camera2_set_parameters;
+ camera2_ops->get_parameters = camera2_get_parameters;
+ camera2_ops->put_parameters = camera2_put_parameters;
+ camera2_ops->send_command = camera2_send_command;
+ camera2_ops->release = camera2_release;
+ camera2_ops->dump = camera2_dump;
+
+ *device = &camera2_device->base.common;
+ }
+
+ return rv;
+
+fail:
+ if(camera2_device) {
+ free(camera2_device);
+ camera2_device = NULL;
+ }
+ if(camera2_ops) {
+ free(camera2_ops);
+ camera2_ops = NULL;
+ }
+ *device = NULL;
+ return rv;
+}
diff --git a/hardware/camera/Camera2Wrapper.h b/hardware/camera/Camera2Wrapper.h
new file mode 100644
index 0000000..20121a5
--- /dev/null
+++ b/hardware/camera/Camera2Wrapper.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <dlfcn.h>
+#include <hardware/camera2.h>
+
+int camera2_device_open(const hw_module_t* module, const char* name, hw_device_t** device);
diff --git a/hardware/camera/Camera3Wrapper.cpp b/hardware/camera/Camera3Wrapper.cpp
new file mode 100644
index 0000000..f4e9cbf
--- /dev/null
+++ b/hardware/camera/Camera3Wrapper.cpp
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_NDEBUG 0
+
+#define LOG_TAG "Camera3Wrapper"
+#include <cutils/log.h>
+
+#include "CameraWrapper.h"
+#include "Camera3Wrapper.h"
+
+typedef struct wrapper_camera3_device {
+ camera3_device_t base;
+ int id;
+ camera3_device_t *vendor;
+} wrapper_camera3_device_t;
+
+#define VENDOR_CALL(device, func, ...) ({ \
+ wrapper_camera3_device_t *__wrapper_dev = (wrapper_camera3_device_t*) device; \
+ __wrapper_dev->vendor->ops->func(__wrapper_dev->vendor, ##__VA_ARGS__); \
+})
+
+#define CAMERA_ID(device) (((wrapper_camera3_device_t *)(device))->id)
+
+static camera_module_t *gVendorModule = 0;
+
+static int check_vendor_module()
+{
+ int rv = 0;
+ ALOGV("%s", __FUNCTION__);
+
+ if(gVendorModule)
+ return 0;
+
+ rv = hw_get_module_by_class("camera", "vendor", (const hw_module_t **)&gVendorModule);
+ if (rv)
+ ALOGE("failed to open vendor camera module");
+ return rv;
+}
+
+/*******************************************************************
+ * implementation of camera_device_ops functions
+ *******************************************************************/
+
+static int camera3_initialize(const camera3_device_t *device, const camera3_callback_ops_t *callback_ops)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return -1;
+
+ return VENDOR_CALL(device, initialize, callback_ops);
+}
+
+static int camera3_configure_streams(const camera3_device *device, camera3_stream_configuration_t *stream_list)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return -1;
+
+ return VENDOR_CALL(device, configure_streams, stream_list);
+}
+
+static int camera3_register_stream_buffers(const camera3_device *device, const camera3_stream_buffer_set_t *buffer_set)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return -1;
+
+ return VENDOR_CALL(device, register_stream_buffers, buffer_set);
+}
+
+static const camera_metadata_t *camera3_construct_default_request_settings(const camera3_device_t *device, int type)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return NULL;
+
+ return VENDOR_CALL(device, construct_default_request_settings, type);
+}
+
+static int camera3_process_capture_request(const camera3_device_t *device, camera3_capture_request_t *request)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return -1;
+
+ return VENDOR_CALL(device, process_capture_request, request);
+}
+
+static void camera3_get_metadata_vendor_tag_ops(const camera3_device *device, vendor_tag_query_ops_t* ops)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return;
+
+ VENDOR_CALL(device, get_metadata_vendor_tag_ops, ops);
+}
+
+static void camera3_dump(const camera3_device_t *device, int fd)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return;
+
+ VENDOR_CALL(device, dump, fd);
+}
+
+static int camera3_flush(const camera3_device_t* device)
+{
+ ALOGV("%s->%08X->%08X", __FUNCTION__, (uintptr_t)device,
+ (uintptr_t)(((wrapper_camera3_device_t*)device)->vendor));
+
+ if (!device)
+ return -1;
+
+ return VENDOR_CALL(device, flush);
+}
+
+static int camera3_device_close(hw_device_t *device)
+{
+ int ret = 0;
+ wrapper_camera3_device_t *wrapper_dev = NULL;
+
+ ALOGV("%s", __FUNCTION__);
+
+ android::Mutex::Autolock lock(gCameraWrapperLock);
+
+ if (!device) {
+ ret = -EINVAL;
+ goto done;
+ }
+
+ wrapper_dev = (wrapper_camera3_device_t*) device;
+
+ wrapper_dev->vendor->common.close((hw_device_t*)wrapper_dev->vendor);
+ if (wrapper_dev->base.ops)
+ free(wrapper_dev->base.ops);
+ free(wrapper_dev);
+done:
+ return ret;
+}
+
+/*******************************************************************
+ * implementation of camera_module functions
+ *******************************************************************/
+
+/* open device handle to one of the cameras
+ *
+ * assume camera service will keep singleton of each camera
+ * so this function will always only be called once per camera instance
+ */
+
+int camera3_device_open(const hw_module_t *module, const char *name,
+ hw_device_t **device)
+{
+ int rv = 0;
+ int num_cameras = 0;
+ int cameraid;
+ wrapper_camera3_device_t *camera3_device = NULL;
+ camera3_device_ops_t *camera3_ops = NULL;
+
+ android::Mutex::Autolock lock(gCameraWrapperLock);
+
+ ALOGV("%s", __FUNCTION__);
+
+ if (name != NULL) {
+ if (check_vendor_module())
+ return -EINVAL;
+
+ cameraid = atoi(name);
+ num_cameras = gVendorModule->get_number_of_cameras();
+
+ if (cameraid > num_cameras) {
+ ALOGE("camera service provided cameraid out of bounds, "
+ "cameraid = %d, num supported = %d",
+ cameraid, num_cameras);
+ rv = -EINVAL;
+ goto fail;
+ }
+
+ camera3_device = (wrapper_camera3_device_t*)malloc(sizeof(*camera3_device));
+ if (!camera3_device) {
+ ALOGE("camera3_device allocation fail");
+ rv = -ENOMEM;
+ goto fail;
+ }
+ memset(camera3_device, 0, sizeof(*camera3_device));
+ camera3_device->id = cameraid;
+
+ rv = gVendorModule->common.methods->open((const hw_module_t*)gVendorModule, name, (hw_device_t**)&(camera3_device->vendor));
+ if (rv)
+ {
+ ALOGE("vendor camera open fail");
+ goto fail;
+ }
+ ALOGV("%s: got vendor camera device 0x%08X", __FUNCTION__, (uintptr_t)(camera3_device->vendor));
+
+ camera3_ops = (camera3_device_ops_t*)malloc(sizeof(*camera3_ops));
+ if (!camera3_ops) {
+ ALOGE("camera3_ops allocation fail");
+ rv = -ENOMEM;
+ goto fail;
+ }
+
+ memset(camera3_ops, 0, sizeof(*camera3_ops));
+
+ camera3_device->base.common.tag = HARDWARE_DEVICE_TAG;
+ camera3_device->base.common.version = CAMERA_DEVICE_API_VERSION_3_4;
+ camera3_device->base.common.module = (hw_module_t *)(module);
+ camera3_device->base.common.close = camera3_device_close;
+ camera3_device->base.ops = camera3_ops;
+
+ camera3_ops->initialize = camera3_initialize;
+ camera3_ops->configure_streams = camera3_configure_streams;
+ camera3_ops->register_stream_buffers = NULL;
+ camera3_ops->construct_default_request_settings = camera3_construct_default_request_settings;
+ camera3_ops->process_capture_request = camera3_process_capture_request;
+ camera3_ops->get_metadata_vendor_tag_ops = camera3_get_metadata_vendor_tag_ops;
+ camera3_ops->dump = camera3_dump;
+ camera3_ops->flush = camera3_flush;
+
+ *device = &camera3_device->base.common;
+ }
+
+ return rv;
+
+fail:
+ if (camera3_device) {
+ free(camera3_device);
+ camera3_device = NULL;
+ }
+ if (camera3_ops) {
+ free(camera3_ops);
+ camera3_ops = NULL;
+ }
+ *device = NULL;
+ return rv;
+}
diff --git a/hardware/camera/Camera3Wrapper.h b/hardware/camera/Camera3Wrapper.h
new file mode 100644
index 0000000..bf815ca
--- /dev/null
+++ b/hardware/camera/Camera3Wrapper.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <hardware/camera3.h>
+
+int camera3_device_open(const hw_module_t *module, const char *name, hw_device_t **device);
diff --git a/hardware/camera/CameraWrapper.cpp b/hardware/camera/CameraWrapper.cpp
new file mode 100644
index 0000000..c9bbb72
--- /dev/null
+++ b/hardware/camera/CameraWrapper.cpp
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_PARAMETERS
+
+#define LOG_TAG "CameraWrapper"
+#include <cutils/log.h>
+
+#include "CameraWrapper.h"
+#include "Camera2Wrapper.h"
+#include "Camera3Wrapper.h"
+
+static camera_module_t *gVendorModule = 0;
+
+static int camera_device_open(const hw_module_t* module, const char* name,
+ hw_device_t** device);
+static int camera_get_number_of_cameras(void);
+static int camera_get_camera_info(int camera_id, struct camera_info *info);
+static int camera_set_callbacks(const camera_module_callbacks_t *callbacks);
+static void camera_get_vendor_tag_ops(vendor_tag_ops_t* ops);
+static int camera_open_legacy(const struct hw_module_t* module, const char* id,
+ uint32_t halVersion, struct hw_device_t** device);
+static int camera_init();
+
+static int check_vendor_module()
+{
+ int rv = 0;
+ ALOGV("%s", __FUNCTION__);
+
+ if(gVendorModule)
+ return 0;
+
+ rv = hw_get_module_by_class("camera", "vendor", (const hw_module_t **)&gVendorModule);
+ if (rv)
+ ALOGE("failed to open vendor camera module");
+ return rv;
+}
+
+static struct hw_module_methods_t camera_module_methods = {
+ .open = camera_device_open
+};
+
+camera_module_t HAL_MODULE_INFO_SYM = {
+ .common = {
+ .tag = HARDWARE_MODULE_TAG,
+ .module_api_version = CAMERA_MODULE_API_VERSION_2_3,
+ .hal_api_version = HARDWARE_HAL_API_VERSION,
+ .id = CAMERA_HARDWARE_MODULE_ID,
+ .name = "Zero Camera Wrapper",
+ .author = "The LineageOS Project",
+ .methods = &camera_module_methods,
+ .dso = NULL,
+ .reserved = {0},
+ },
+ .get_number_of_cameras = camera_get_number_of_cameras,
+ .get_camera_info = camera_get_camera_info,
+ .set_callbacks = camera_set_callbacks,
+ .get_vendor_tag_ops = camera_get_vendor_tag_ops,
+ .open_legacy = camera_open_legacy,
+ .set_torch_mode = NULL,
+ .init = camera_init,
+ .reserved = {0},
+};
+
+static int camera_device_open(const hw_module_t* module, const char* name,
+ hw_device_t** device)
+{
+ int rv = -EINVAL;
+
+ if (name != NULL) {
+ if (check_vendor_module())
+ return -EINVAL;
+ rv = camera3_device_open(module, name, device);
+ }
+
+ return rv;
+}
+
+static int camera_get_number_of_cameras(void)
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return 0;
+ return gVendorModule->get_number_of_cameras();
+}
+
+static int camera_get_camera_info(int camera_id, struct camera_info *info)
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return 0;
+ return gVendorModule->get_camera_info(camera_id, info);
+}
+
+static int camera_set_callbacks(const camera_module_callbacks_t *callbacks)
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return 0;
+ return gVendorModule->set_callbacks(callbacks);
+}
+
+static void camera_get_vendor_tag_ops(vendor_tag_ops_t* ops)
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return;
+ return gVendorModule->get_vendor_tag_ops(ops);
+}
+
+static int camera_open_legacy(const struct hw_module_t* module, const char* id, uint32_t halVersion, struct hw_device_t** device)
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return 0;
+ return camera2_device_open(module, id, device);
+}
+
+static int camera_init()
+{
+ ALOGV("%s", __FUNCTION__);
+ if (check_vendor_module())
+ return 0;
+ return gVendorModule->init();
+}
diff --git a/hardware/camera/CameraWrapper.h b/hardware/camera/CameraWrapper.h
new file mode 100644
index 0000000..13ad40f
--- /dev/null
+++ b/hardware/camera/CameraWrapper.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2017, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <utils/String8.h>
+#include <hardware/hardware.h>
+#include <hardware/camera.h>
+#include <camera/Camera.h>
+#include <camera/CameraParameters.h>
+
+static android::Mutex gCameraWrapperLock;
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 01ef42b..6691a74 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -42,7 +42,8 @@
# Camera
PRODUCT_PACKAGES += \
- android.hardware.camera.provider@2.5-service_64.universal7904
+ android.hardware.camera.provider@2.5-service_64.universal7904 \
+ camera.exynos7904
# ConfigStore
PRODUCT_PACKAGES += \