diff options
| author | Alex Ray <aray@google.com> | 2013-05-28 15:52:47 -0700 |
|---|---|---|
| committer | Alex Ray <aray@google.com> | 2013-06-28 13:52:50 -0700 |
| commit | b0be1039c136f85778dffaf761af3d09907e21aa (patch) | |
| tree | 1c67e347c2bfcb7cf056dad64953821982bc89f9 /modules/camera/CameraHAL.cpp | |
| parent | 6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5 (diff) | |
| download | hardware_libhardware-b0be1039c136f85778dffaf761af3d09907e21aa.zip hardware_libhardware-b0be1039c136f85778dffaf761af3d09907e21aa.tar.gz hardware_libhardware-b0be1039c136f85778dffaf761af3d09907e21aa.tar.bz2 | |
modules: camera: add get_camera_info support
Basic static metadata statically constructed from preprocessor passes
over an array of camera metadata tags.
Change-Id: I16ea9f4d68120d5a0bc010a4a67b0cbcd761329e
Diffstat (limited to 'modules/camera/CameraHAL.cpp')
| -rw-r--r-- | modules/camera/CameraHAL.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/camera/CameraHAL.cpp b/modules/camera/CameraHAL.cpp index 05b1fad..0d8164c 100644 --- a/modules/camera/CameraHAL.cpp +++ b/modules/camera/CameraHAL.cpp @@ -76,7 +76,7 @@ int CameraHAL::getCameraInfo(int id, struct camera_info* info) return -ENODEV; } // TODO: return device-specific static metadata - return 0; + return mCameras[id]->getInfo(info); } int CameraHAL::setCallbacks(const camera_module_callbacks_t *callbacks) @@ -93,7 +93,7 @@ int CameraHAL::open(const hw_module_t* mod, const char* name, hw_device_t** dev) ALOGV("%s: module=%p, name=%s, device=%p", __func__, mod, name, dev); id = strtol(name, &nameEnd, 10); - if (nameEnd != NULL) { + if (*nameEnd != '\0') { ALOGE("%s: Invalid camera id name %s", __func__, name); return -EINVAL; } else if (id < 0 || id >= mNumberOfCameras) { |