summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorNipun Kwatra <nkwatra@google.com>2010-07-30 13:40:14 -0700
committerWu-cheng Li <wuchengli@google.com>2010-08-19 09:59:11 -0700
commit0de0c4960da1ec2f6aeada9718755c37cfee45e0 (patch)
treed4b118c21a562585034b91b08a375476d9c1710e /include/camera
parentc4554b9a0885ac3713575e91d8d33c5670b52322 (diff)
downloadframeworks_base-0de0c4960da1ec2f6aeada9718755c37cfee45e0.zip
frameworks_base-0de0c4960da1ec2f6aeada9718755c37cfee45e0.tar.gz
frameworks_base-0de0c4960da1ec2f6aeada9718755c37cfee45e0.tar.bz2
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Also added a struct 'Size' containing a width and a height field. Modified parse_size to optionally set an end pointer pointing to the character after the found size. Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/CameraParameters.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 99a3115..013452f 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -22,6 +22,21 @@
namespace android {
+struct Size {
+ int width;
+ int height;
+
+ Size() {
+ width = 0;
+ height = 0;
+ }
+
+ Size(int w, int h) {
+ width = w;
+ height = h;
+ }
+};
+
class CameraParameters
{
public:
@@ -49,6 +64,7 @@ public:
const char *getPreviewFormat() const;
void setPictureSize(int width, int height);
void getPictureSize(int *width, int *height) const;
+ void getSupportedPictureSizes(Vector<Size> &sizes) const;
void setPictureFormat(const char *format);
const char *getPictureFormat() const;