summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorKevin Bruckert <agrabren@yahoo.com>2012-11-20 04:48:00 -0800
committerDorian Snyder <dastin1015@gmail.com>2013-04-28 21:31:40 -0700
commitea33819479ae5b53b80704c12a317b1555adbc97 (patch)
tree3036675bd0b17960cc84fa89c6f94b12fb138a09 /camera
parente411d62373f5d13f6bebf3073efa6f94fd7ba460 (diff)
downloadframeworks_av-ea33819479ae5b53b80704c12a317b1555adbc97.zip
frameworks_av-ea33819479ae5b53b80704c12a317b1555adbc97.tar.gz
frameworks_av-ea33819479ae5b53b80704c12a317b1555adbc97.tar.bz2
Add camera parameters for htc evo 3D. (1/2)
Use BOARD_HTC_3D_SUPPORT to enable. Change-Id: I28fa3f1586071bcc78b8e887bbbf699d338a0ceb
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index b082c1b..411bfac 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -66,6 +66,7 @@ const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-value
const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size";
const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";
const char CameraParameters::KEY_PICTURE_FORMAT[] = "picture-format";
+const char CameraParameters::KEY_SUPPORTED_3D_FILE_FORMAT[] = "3d-file-format";
const char CameraParameters::KEY_SUPPORTED_PICTURE_FORMATS[] = "picture-format-values";
const char CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH[] = "jpeg-thumbnail-width";
const char CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT[] = "jpeg-thumbnail-height";
@@ -376,6 +377,9 @@ const char CameraParameters::SELECTABLE_ZONE_AF_FRAME_AVERAGE[] = "frame-average
const char CameraParameters::FACE_DETECTION_OFF[] = "off";
const char CameraParameters::FACE_DETECTION_ON[] = "on";
+const char CameraParameters::FILE_FORMAT_MPO[] = "mpo";
+const char CameraParameters::FILE_FORMAT_JPS[] = "jps";
+
// Values for MCE settings.
const char CameraParameters::MCE_ENABLE[] = "enable";
const char CameraParameters::MCE_DISABLE[] = "disable";
@@ -787,6 +791,11 @@ void CameraParameters::getSupportedPictureSizes(Vector<Size> &sizes) const
parseSizesList(pictureSizesStr, sizes);
}
+void CameraParameters::set3DFileFormat(const char *format)
+{
+ set(KEY_SUPPORTED_3D_FILE_FORMAT, format);
+}
+
void CameraParameters::setPictureFormat(const char *format)
{
set(KEY_PICTURE_FORMAT, format);