summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-07-18 17:50:46 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-07-18 17:53:39 -0700
commitf6d9696bf1db133d16dd8981380e1bfbd2e0bc70 (patch)
tree9599fa0f762f48aaffb17429f4b885236734d07b
parentea682976030a3930f6ee49b33b7e21abfc68174a (diff)
downloadframeworks_av-f6d9696bf1db133d16dd8981380e1bfbd2e0bc70.zip
frameworks_av-f6d9696bf1db133d16dd8981380e1bfbd2e0bc70.tar.gz
frameworks_av-f6d9696bf1db133d16dd8981380e1bfbd2e0bc70.tar.bz2
Camera: Add OPAQUE pixel format to CameraParameters
This is only used to support recording with HAL 2 in the KEY_VIDEO_FRAME_FORMAT parameter, and is not exposed to applications. Bug: 6243944 Change-Id: I5976a748d199ae98189bd03af5bbd9e18cbd6bf0
-rw-r--r--camera/CameraParameters.cpp1
-rw-r--r--include/camera/CameraParameters.h2
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