diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-07-20 18:40:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-20 18:40:30 -0700 |
| commit | 68ea6cab354a635ea848bc2b5cf172d7a215a057 (patch) | |
| tree | 7493493a0cd877fbb77432e4ea8601286b1da020 | |
| parent | e78d5c7bfda1e80223436df3faeb4a9e2e719bcf (diff) | |
| parent | f6d9696bf1db133d16dd8981380e1bfbd2e0bc70 (diff) | |
| download | frameworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.zip frameworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.tar.gz frameworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.tar.bz2 | |
Merge "Camera: Add OPAQUE pixel format to CameraParameters"
| -rw-r--r-- | camera/CameraParameters.cpp | 1 | ||||
| -rw-r--r-- | include/camera/CameraParameters.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 059a8a5..872512a 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -155,6 +155,7 @@ const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565"; const char CameraParameters::PIXEL_FORMAT_RGBA8888[] = "rgba8888"; const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg"; const char CameraParameters::PIXEL_FORMAT_BAYER_RGGB[] = "bayer-rggb"; +const char CameraParameters::PIXEL_FORMAT_ANDROID_OPAQUE[] = "android-opaque"; // Values for focus mode settings. const char CameraParameters::FOCUS_MODE_AUTO[] = "auto"; diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 36248a0..4d5aa36 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -606,6 +606,8 @@ public: // Raw bayer format used for images, which is 10 bit precision samples // stored in 16 bit words. The filter pattern is RGGB. static const char PIXEL_FORMAT_BAYER_RGGB[]; + // Pixel format is not known to the framework + static const char PIXEL_FORMAT_ANDROID_OPAQUE[]; // Values for focus mode settings. // Auto-focus mode. Applications should call |