summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-02-24 02:51:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-24 02:51:17 -0800
commit6f7a293c1bbf993ff712927e3e14af0d195cf1c1 (patch)
tree7aa567d3e1209295b495de91e7160e362a918ddc /camera
parent17e89b555a41aa591f1a01ecd51a7cb5a7bcfc0e (diff)
parentd42c6e8904f1648a7dedcd1dc27b926951f8ff28 (diff)
downloadframeworks_av-6f7a293c1bbf993ff712927e3e14af0d195cf1c1.zip
frameworks_av-6f7a293c1bbf993ff712927e3e14af0d195cf1c1.tar.gz
frameworks_av-6f7a293c1bbf993ff712927e3e14af0d195cf1c1.tar.bz2
Merge "Add YV12 preview format to camera parameter constants."
Diffstat (limited to 'camera')
-rw-r--r--camera/CameraParameters.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index e9a5f8c..0fd79a4 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -132,10 +132,10 @@ const char CameraParameters::SCENE_MODE_PARTY[] = "party";
const char CameraParameters::SCENE_MODE_CANDLELIGHT[] = "candlelight";
const char CameraParameters::SCENE_MODE_BARCODE[] = "barcode";
-const char CameraParameters::PIXEL_FORMAT_YUV420P[] = "yuv420p";
const char CameraParameters::PIXEL_FORMAT_YUV422SP[] = "yuv422sp";
const char CameraParameters::PIXEL_FORMAT_YUV420SP[] = "yuv420sp";
const char CameraParameters::PIXEL_FORMAT_YUV422I[] = "yuv422i-yuyv";
+const char CameraParameters::PIXEL_FORMAT_YUV420P[] = "yuv420p";
const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565";
const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg";