diff options
| author | Jianing Wei <jianingwei@google.com> | 2014-03-22 00:04:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-22 00:04:20 +0000 |
| commit | cfe09079608d78a0a358f01bb49f279859e38664 (patch) | |
| tree | 9a1b044149726ec242d3a5e948029d71803aaf7e /services/camera/libcameraservice/device2 | |
| parent | 55d15957bc44d11052e1cb3eea3340ec00f70bae (diff) | |
| parent | 90e59c98c343e941b1a75307ffa4b4b5f1eb50d6 (diff) | |
| download | frameworks_av-cfe09079608d78a0a358f01bb49f279859e38664.zip frameworks_av-cfe09079608d78a0a358f01bb49f279859e38664.tar.gz frameworks_av-cfe09079608d78a0a358f01bb49f279859e38664.tar.bz2 | |
Merge "CameraService: Add support for burst capture and repeating burst."
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 12 | ||||
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.h | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index f60ca98..9b0ad91 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -207,6 +207,12 @@ status_t Camera2Device::capture(CameraMetadata &request) { return OK; } +status_t Camera2Device::captureList(const List<const CameraMetadata> &requests) { + ATRACE_CALL(); + ALOGE("%s: Camera2Device burst capture not implemented", __FUNCTION__); + return INVALID_OPERATION; +} + status_t Camera2Device::setStreamingRequest(const CameraMetadata &request) { ATRACE_CALL(); @@ -215,6 +221,12 @@ status_t Camera2Device::setStreamingRequest(const CameraMetadata &request) { return mRequestQueue.setStreamSlot(streamRequest.release()); } +status_t Camera2Device::setStreamingRequestList(const List<const CameraMetadata> &requests) { + ATRACE_CALL(); + ALOGE("%s, Camera2Device streaming burst not implemented", __FUNCTION__); + return INVALID_OPERATION; +} + status_t Camera2Device::clearStreamingRequest() { ATRACE_CALL(); return mRequestQueue.setStreamSlot(NULL); diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h index 5b91f88..61bfd1a 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.h +++ b/services/camera/libcameraservice/device2/Camera2Device.h @@ -48,7 +48,9 @@ class Camera2Device: public CameraDeviceBase { virtual status_t dump(int fd, const Vector<String16>& args); virtual const CameraMetadata& info() const; virtual status_t capture(CameraMetadata &request); + virtual status_t captureList(const List<const CameraMetadata> &requests); virtual status_t setStreamingRequest(const CameraMetadata &request); + virtual status_t setStreamingRequestList(const List<const CameraMetadata> &requests); virtual status_t clearStreamingRequest(); virtual status_t waitUntilRequestReceived(int32_t requestId, nsecs_t timeout); virtual status_t createStream(sp<ANativeWindow> consumer, |