diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-19 11:08:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-19 11:08:36 -0700 |
| commit | 3ac620a0ab90dd5e4a8bcd93ab596c848f29bbbf (patch) | |
| tree | af1178fe966bf2655cc82f5b5045cd801af8c9d9 /include | |
| parent | c0f7ec8134eca61752d23c10596dd211745642d9 (diff) | |
| parent | 34c91a321c297c1a7518ec4f10ae5993904034dd (diff) | |
| download | frameworks_av-3ac620a0ab90dd5e4a8bcd93ab596c848f29bbbf.zip frameworks_av-3ac620a0ab90dd5e4a8bcd93ab596c848f29bbbf.tar.gz frameworks_av-3ac620a0ab90dd5e4a8bcd93ab596c848f29bbbf.tar.bz2 | |
Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 16 |
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; |