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 | 6f7a293c1bbf993ff712927e3e14af0d195cf1c1 (patch) | |
| tree | 7aa567d3e1209295b495de91e7160e362a918ddc /include/camera | |
| parent | 17e89b555a41aa591f1a01ecd51a7cb5a7bcfc0e (diff) | |
| parent | d42c6e8904f1648a7dedcd1dc27b926951f8ff28 (diff) | |
| download | frameworks_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 'include/camera')
| -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 431aaa4..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[]; |