drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78624e41: Add remove method in CameraParameters class.

Browse Source 
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.
This commit is contained in:
Wu-cheng Li
2010-05-12 07:48:41 -07:00
committed by Android Git Automerger
parent a8d8cb12b3 78624e41da
commit d8c33747af
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/camera/CameraParameters.h
View File

@ -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;

5
libs/camera/CameraParameters.cpp
View File

@ -253,6 +253,11 @@ float CameraParameters::getFloat(const char *key) const
return strtof(v, 0);
}
void CameraParameters::remove(const char *key)
{
mMap.removeItem(String8(key));
}
static int parse_size(const char *str, int &width, int &height)
{
// Find the width.