diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-02-24 02:51:17 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-24 02:51:17 -0800 |
commit | e857cc8175d532eccbe75798c56bf3c5378e585e (patch) | |
tree | 40f7645995be0645a717a9b2643446f831dcd291 /libs/camera/CameraParameters.cpp | |
parent | 47b8adec3904535c8d8ce2b6e42ecd736f2d90ce (diff) | |
parent | 10a1b30dfbd0bbeae6776e353600986647c6e0a8 (diff) | |
download | frameworks_base-e857cc8175d532eccbe75798c56bf3c5378e585e.zip frameworks_base-e857cc8175d532eccbe75798c56bf3c5378e585e.tar.gz frameworks_base-e857cc8175d532eccbe75798c56bf3c5378e585e.tar.bz2 |
Merge "Add YV12 preview format to camera parameter constants."
Diffstat (limited to 'libs/camera/CameraParameters.cpp')
-rw-r--r-- | libs/camera/CameraParameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp index e9a5f8c..0fd79a4 100644 --- a/libs/camera/CameraParameters.cpp +++ b/libs/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"; |