summaryrefslogtreecommitdiffstats
path: root/include
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
commit34c91a321c297c1a7518ec4f10ae5993904034dd (patch)
tree4ab2943804b3d534da5539037c8c8957648684b1 /include
parent186c38766c030b15135e7e8484d2d6b83464513a (diff)
downloadframeworks_av-34c91a321c297c1a7518ec4f10ae5993904034dd.zip
frameworks_av-34c91a321c297c1a7518ec4f10ae5993904034dd.tar.gz
frameworks_av-34c91a321c297c1a7518ec4f10ae5993904034dd.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')
-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;