Add remove method in CameraParameters class.
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 3b0e9e5..5ea83a5 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 b50d4d2..65fd7ac 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -253,6 +253,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.