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 /include | |
| 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 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 431aaa47..da2f049 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -417,11 +417,10 @@ public: // Pixel color formats for KEY_PREVIEW_FORMAT, KEY_PICTURE_FORMAT, // and KEY_VIDEO_FRAME_FORMAT - // Planar variant of the YUV420 color format - static const char PIXEL_FORMAT_YUV420P[]; static const char PIXEL_FORMAT_YUV422SP[]; static const char PIXEL_FORMAT_YUV420SP[]; // NV21 static const char PIXEL_FORMAT_YUV422I[]; // YUY2 + static const char PIXEL_FORMAT_YUV420P[]; // YV12 static const char PIXEL_FORMAT_RGB565[]; static const char PIXEL_FORMAT_JPEG[]; |