summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-07-20 18:40:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-20 18:40:30 -0700
commit68ea6cab354a635ea848bc2b5cf172d7a215a057 (patch)
tree7493493a0cd877fbb77432e4ea8601286b1da020 /include
parente78d5c7bfda1e80223436df3faeb4a9e2e719bcf (diff)
parentf6d9696bf1db133d16dd8981380e1bfbd2e0bc70 (diff)
downloadframeworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.zip
frameworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.tar.gz
frameworks_av-68ea6cab354a635ea848bc2b5cf172d7a215a057.tar.bz2
Merge "Camera: Add OPAQUE pixel format to CameraParameters"
Diffstat (limited to 'include')
-rw-r--r--include/camera/CameraParameters.h2
1 files changed, 2 insertions, 0 deletions
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