summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2010-05-12 07:55:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:55:00 -0700
commit83e5a900e5eccbd2af300c03d24d72365d0c8323 (patch)
treeec052ddb975e64a27fdf12ade7e24df07f899b04 /include/camera
parentef9d0cd72e476a4b7556833fb09505a51b626797 (diff)
parentadbda96f6a05507788bb4163d7fbe8a95948f0a5 (diff)
downloadframeworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.zip
frameworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.tar.gz
frameworks_av-83e5a900e5eccbd2af300c03d24d72365d0c8323.tar.bz2
am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken * commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728': Add remove method in CameraParameters class.
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/CameraParameters.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 0d27f1a..979df9f 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -39,23 +39,16 @@ public:
int getInt(const char *key) const;
float getFloat(const char *key) const;
- /* preview-size=176x144 */
+ void remove(const char *key);
+
void setPreviewSize(int width, int height);
void getPreviewSize(int *width, int *height) const;
-
- /* preview-fps=15 */
void setPreviewFrameRate(int fps);
int getPreviewFrameRate() const;
-
- /* preview-format=rgb565|yuv422 */
void setPreviewFormat(const char *format);
const char *getPreviewFormat() const;
-
- /* picture-size=1024x768 */
void setPictureSize(int width, int height);
void getPictureSize(int *width, int *height) const;
-
- /* picture-format=yuv422|jpeg */
void setPictureFormat(const char *format);
const char *getPictureFormat() const;