From 7b33a74bbc514b99c16be7fff9a34e892bc19264 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 21 Feb 2013 13:49:26 -0800 Subject: ProCamera: Add getInfo for getting static metadata (and a test) Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166 --- camera/ProCamera.cpp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'camera/ProCamera.cpp') 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 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 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, -- cgit v1.1