diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-01-30 10:29:02 -0800 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-02-03 15:23:56 -0800 |
| commit | e074a93046ebe5cea0b55c3a479e082a426e1e07 (patch) | |
| tree | c1b960cf44d005a19e8609e5be3d3f47c4ad0366 /services/camera/libcameraservice/device3/Camera3Device.cpp | |
| parent | 16469200f5a94277178ea41ed59898a113320b60 (diff) | |
| download | frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.zip frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.tar.gz frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.tar.bz2 | |
CameraService: intercept Camera module
Wrap camera module returned from HAL so get_camera_info returns
static_camera_characteristics processed by framework, which
generates keys added after HAL3.2 is released.
Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
Diffstat (limited to 'services/camera/libcameraservice/device3/Camera3Device.cpp')
| -rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index 53e6fa9..9a4e5ac 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -86,7 +86,7 @@ int Camera3Device::getId() const { * CameraDeviceBase interface */ -status_t Camera3Device::initialize(camera_module_t *module) +status_t Camera3Device::initialize(CameraModule *module) { ATRACE_CALL(); Mutex::Autolock il(mInterfaceLock); @@ -106,9 +106,8 @@ status_t Camera3Device::initialize(camera_module_t *module) camera3_device_t *device; ATRACE_BEGIN("camera3->open"); - res = CameraService::filterOpenErrorCode(module->common.methods->open( - &module->common, deviceName.string(), - reinterpret_cast<hw_device_t**>(&device))); + res = CameraService::filterOpenErrorCode(module->open( + deviceName.string(), reinterpret_cast<hw_device_t**>(&device))); ATRACE_END(); if (res != OK) { @@ -127,7 +126,7 @@ status_t Camera3Device::initialize(camera_module_t *module) } camera_info info; - res = CameraService::filterGetInfoErrorCode(module->get_camera_info( + res = CameraService::filterGetInfoErrorCode(module->getCameraInfo( mId, &info)); if (res != OK) return res; |