am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken
* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
Add remove method in CameraParameters class.
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 @@
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;
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index d8f9c71..cfb7ba1 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -254,6 +254,11 @@
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.