diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-09 19:57:56 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2014-05-21 18:14:41 -0700 |
commit | b2119af7f4ced0ecfefd4c7388f86b4e3a3ea7d8 (patch) | |
tree | a97770362fc690d625a0383597cb057d48737876 /services/camera/libcameraservice/api2 | |
parent | 7ac0039611ea7ea18f9545f96a8f5cb31dcdebe5 (diff) | |
download | frameworks_av-b2119af7f4ced0ecfefd4c7388f86b4e3a3ea7d8.zip frameworks_av-b2119af7f4ced0ecfefd4c7388f86b4e3a3ea7d8.tar.gz frameworks_av-b2119af7f4ced0ecfefd4c7388f86b4e3a3ea7d8.tar.bz2 |
camera2: Update CameraService for HAL1 shim.
Updates the camera service to handle shim connections.
Changes include:
- Adds begin/end configure binder calls.
- Adds cache for shim client static camera metadata.
- Implements basic getCameraCharacteristic functionality for shim clients.
Bug: 15116722
Bug: 15117269
Change-Id: I510c5888ca15f8e7d3b8ed1680ff1c7f8f514744
Diffstat (limited to 'services/camera/libcameraservice/api2')
-rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 12 | ||||
-rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 5a48a62..4fce1b3 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -246,6 +246,18 @@ status_t CameraDeviceClient::cancelRequest(int requestId, int64_t* lastFrameNumb return res; } +status_t CameraDeviceClient::beginConfigure() { + // TODO: Implement this. + ALOGE("%s: Not implemented yet.", __FUNCTION__); + return OK; +} + +status_t CameraDeviceClient::endConfigure() { + // TODO: Implement this. + ALOGE("%s: Not implemented yet.", __FUNCTION__); + return OK; +} + status_t CameraDeviceClient::deleteStream(int streamId) { ATRACE_CALL(); ALOGV("%s (streamId = 0x%x)", __FUNCTION__, streamId); diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index 0b37784..9981dfe 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h @@ -76,6 +76,10 @@ public: /*out*/ int64_t* lastFrameNumber = NULL); + virtual status_t beginConfigure(); + + virtual status_t endConfigure(); + // Returns -EBUSY if device is not idle virtual status_t deleteStream(int streamId); |