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 | |
| 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."
| -rw-r--r-- | core/java/android/hardware/Camera.java | 5 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 3 | ||||
| -rw-r--r-- | libs/camera/CameraParameters.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index d8a5b45..958bf08 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1362,6 +1362,7 @@ public class Camera { private static final String PIXEL_FORMAT_YUV422SP = "yuv422sp"; private static final String PIXEL_FORMAT_YUV420SP = "yuv420sp"; private static final String PIXEL_FORMAT_YUV422I = "yuv422i-yuyv"; + private static final String PIXEL_FORMAT_YUV420P = "yuv420p"; private static final String PIXEL_FORMAT_RGB565 = "rgb565"; private static final String PIXEL_FORMAT_JPEG = "jpeg"; @@ -1882,6 +1883,7 @@ public class Camera { case ImageFormat.NV16: return PIXEL_FORMAT_YUV422SP; case ImageFormat.NV21: return PIXEL_FORMAT_YUV420SP; case ImageFormat.YUY2: return PIXEL_FORMAT_YUV422I; + case ImageFormat.YV12: return PIXEL_FORMAT_YUV420P; case ImageFormat.RGB_565: return PIXEL_FORMAT_RGB565; case ImageFormat.JPEG: return PIXEL_FORMAT_JPEG; default: return null; @@ -1901,6 +1903,9 @@ public class Camera { if (format.equals(PIXEL_FORMAT_YUV422I)) return ImageFormat.YUY2; + if (format.equals(PIXEL_FORMAT_YUV420P)) + return ImageFormat.YV12; + if (format.equals(PIXEL_FORMAT_RGB565)) return ImageFormat.RGB_565; 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[]; 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"; |