summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-02-21 13:49:26 -0800
committerIgor Murashkin <iam@google.com>2013-02-22 10:50:15 -0800
commit7b33a74bbc514b99c16be7fff9a34e892bc19264 (patch)
treea3c2e719aebc4dc486312970b57c588cba8f5ce9 /include/camera
parenta91537e268f2b35f9f0dfdc0c4f84655c93285ae (diff)
downloadframeworks_av-7b33a74bbc514b99c16be7fff9a34e892bc19264.zip
frameworks_av-7b33a74bbc514b99c16be7fff9a34e892bc19264.tar.gz
frameworks_av-7b33a74bbc514b99c16be7fff9a34e892bc19264.tar.bz2
ProCamera: Add getInfo for getting static metadata (and a test)
Change-Id: I3b87dfbc621d98bf41f37a892a1012baf85b5166
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/IProCameraUser.h5
-rw-r--r--include/camera/ProCamera.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/include/camera/IProCameraUser.h b/include/camera/IProCameraUser.h
index a141769..7bddb0c 100644
--- a/include/camera/IProCameraUser.h
+++ b/include/camera/IProCameraUser.h
@@ -75,6 +75,11 @@ public:
camera_metadata** request)
= 0;
+ // Get static camera metadata
+ virtual status_t getCameraInfo(int cameraId,
+ /*out*/
+ camera_metadata** info) = 0;
+
};
// ----------------------------------------------------------------------------
diff --git a/include/camera/ProCamera.h b/include/camera/ProCamera.h
index 7cd9138..11904f9 100644
--- a/include/camera/ProCamera.h
+++ b/include/camera/ProCamera.h
@@ -172,7 +172,7 @@ public:
static int getNumberOfCameras();
// Get static camera metadata
- static camera_metadata* getCameraInfo(int cameraId);
+ camera_metadata* getCameraInfo(int cameraId);
sp<IProCameraUser> remote();