summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/device2
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-08-13 17:58:46 -0700
committerRuben Brunk <rubenbrunk@google.com>2015-08-14 17:30:24 -0700
commitc78ac26e3a65328fc0118f16ee76a800d0687eb7 (patch)
tree9009e37c981c7cbfdd106c44de2622edf1672a49 /services/camera/libcameraservice/device2
parenta09f8cf8c76fa946c4b91be059b420941abcdc3b (diff)
downloadframeworks_av-c78ac26e3a65328fc0118f16ee76a800d0687eb7.zip
frameworks_av-c78ac26e3a65328fc0118f16ee76a800d0687eb7.tar.gz
frameworks_av-c78ac26e3a65328fc0118f16ee76a800d0687eb7.tar.bz2
Add experimental camera session prepare API.
Bug: 18949148 Change-Id: I8f73e68ea2e3acc60d98954106f364d13f439a82
Diffstat (limited to 'services/camera/libcameraservice/device2')
-rw-r--r--services/camera/libcameraservice/device2/Camera2Device.cpp6
-rw-r--r--services/camera/libcameraservice/device2/Camera2Device.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp
index c9c990c..d74f976 100644
--- a/services/camera/libcameraservice/device2/Camera2Device.cpp
+++ b/services/camera/libcameraservice/device2/Camera2Device.cpp
@@ -632,6 +632,12 @@ status_t Camera2Device::tearDown(int streamId) {
return NO_INIT;
}
+status_t Camera2Device::prepare(int maxCount, int streamId) {
+ ATRACE_CALL();
+ ALOGE("%s: Camera %d: unimplemented", __FUNCTION__, mId);
+ return NO_INIT;
+}
+
uint32_t Camera2Device::getDeviceVersion() {
ATRACE_CALL();
return mDeviceVersion;
diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h
index 34c1ded..b4d343c 100644
--- a/services/camera/libcameraservice/device2/Camera2Device.h
+++ b/services/camera/libcameraservice/device2/Camera2Device.h
@@ -88,6 +88,7 @@ class Camera2Device: public CameraDeviceBase {
// Prepare and tearDown are no-ops
virtual status_t prepare(int streamId);
virtual status_t tearDown(int streamId);
+ virtual status_t prepare(int maxCount, int streamId);
virtual uint32_t getDeviceVersion();
virtual ssize_t getJpegBufferSize(uint32_t width, uint32_t height) const;