diff options
author | Igor Murashkin <iam@google.com> | 2013-02-21 13:49:26 -0800 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2013-02-22 10:50:15 -0800 |
commit | d127c2c8a8b68dae2f8743c310c2547e8f46d967 (patch) | |
tree | ac671025a00cc2f9580a1c62caa4009b915e97ee /camera/ProCamera.cpp | |
parent | 418e493e8d67924cfda652cb64965647ce6381cb (diff) | |
download | frameworks_av-d127c2c8a8b68dae2f8743c310c2547e8f46d967.zip frameworks_av-d127c2c8a8b68dae2f8743c310c2547e8f46d967.tar.gz frameworks_av-d127c2c8a8b68dae2f8743c310c2547e8f46d967.tar.bz2 |
ProCamera: Add getInfo for getting static metadata (and a test)
Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
Diffstat (limited to 'camera/ProCamera.cpp')
-rw-r--r-- | camera/ProCamera.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/camera/ProCamera.cpp b/camera/ProCamera.cpp index 142c03b..c95c4e0 100644 --- a/camera/ProCamera.cpp +++ b/camera/ProCamera.cpp @@ -361,15 +361,28 @@ status_t ProCamera::createStreamCpu(int width, int height, int format, } int ProCamera::getNumberOfCameras() { - ALOGE("%s: not implemented yet", __FUNCTION__); - return 1; + const sp<ICameraService> cs = getCameraService(); + + if (!cs.get()) { + return DEAD_OBJECT; + } + return cs->getNumberOfCameras(); } camera_metadata* ProCamera::getCameraInfo(int cameraId) { - ALOGE("%s: not implemented yet", __FUNCTION__); - ALOGV("%s: cameraId = %d", __FUNCTION__, cameraId); - return NULL; + + sp <IProCameraUser> c = mCamera; + if (c == 0) return NULL; + + camera_metadata* ptr = NULL; + status_t status = c->getCameraInfo(cameraId, &ptr); + + if (status != OK) { + ALOGE("%s: Failed to get camera info, error = %d", __FUNCTION__, status); + } + + return ptr; } status_t ProCamera::createDefaultRequest(int templateId, |