summaryrefslogtreecommitdiffstats
path: root/modules/camera
diff options
context:
space:
mode:
Diffstat (limited to 'modules/camera')
-rw-r--r--modules/camera/Camera.cpp15
-rw-r--r--modules/camera/Camera.h1
-rw-r--r--modules/camera/CameraHAL.h1
3 files changed, 2 insertions, 15 deletions
diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp
index 57cdb47..0ddf001 100644
--- a/modules/camera/Camera.cpp
+++ b/modules/camera/Camera.cpp
@@ -467,12 +467,6 @@ void Camera::notifyShutter(uint32_t frame_number, uint64_t timestamp)
mCallbackOps->notify(mCallbackOps, &m);
}
-void Camera::getMetadataVendorTagOps(vendor_tag_query_ops_t *ops)
-{
- ALOGV("%s:%d: ops=%p", __func__, mId, ops);
- // TODO: return vendor tag ops
-}
-
void Camera::dump(int fd)
{
ALOGV("%s:%d: Dumping to fd %d", __func__, mId, fd);
@@ -571,12 +565,6 @@ static int process_capture_request(const camera3_device_t *dev,
return camdev_to_camera(dev)->processCaptureRequest(request);
}
-static void get_metadata_vendor_tag_ops(const camera3_device_t *dev,
- vendor_tag_query_ops_t *ops)
-{
- camdev_to_camera(dev)->getMetadataVendorTagOps(ops);
-}
-
static void dump(const camera3_device_t *dev, int fd)
{
camdev_to_camera(dev)->dump(fd);
@@ -590,8 +578,7 @@ const camera3_device_ops_t Camera::sOps = {
.construct_default_request_settings =
default_camera_hal::construct_default_request_settings,
.process_capture_request = default_camera_hal::process_capture_request,
- .get_metadata_vendor_tag_ops =
- default_camera_hal::get_metadata_vendor_tag_ops,
+ .get_metadata_vendor_tag_ops = NULL,
.dump = default_camera_hal::dump
};
diff --git a/modules/camera/Camera.h b/modules/camera/Camera.h
index f1f33b1..0ceaf25 100644
--- a/modules/camera/Camera.h
+++ b/modules/camera/Camera.h
@@ -48,7 +48,6 @@ class Camera {
int registerStreamBuffers(const camera3_stream_buffer_set_t *buf_set);
const camera_metadata_t *constructDefaultRequestSettings(int type);
int processCaptureRequest(camera3_capture_request_t *request);
- void getMetadataVendorTagOps(vendor_tag_query_ops_t *ops);
void dump(int fd);
diff --git a/modules/camera/CameraHAL.h b/modules/camera/CameraHAL.h
index a5edc85..cb0ec8b 100644
--- a/modules/camera/CameraHAL.h
+++ b/modules/camera/CameraHAL.h
@@ -20,6 +20,7 @@
#include <cutils/bitops.h>
#include <hardware/hardware.h>
#include <hardware/camera_common.h>
+#include <system/vendor_tags.h>
#include "Camera.h"
#include "VendorTags.h"