summaryrefslogtreecommitdiffstats
path: root/include/gui
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-01-22 16:37:37 -0800
committerLajos Molnar <lajos@google.com>2015-01-28 16:52:43 -0800
commit6a26be7c2b1e5a84b5d2105780148016889285e6 (patch)
tree28d89c4b88d3c91dc9fecdc3891a74d0db93e30f /include/gui
parentd6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8 (diff)
downloadframeworks_native-6a26be7c2b1e5a84b5d2105780148016889285e6.zip
frameworks_native-6a26be7c2b1e5a84b5d2105780148016889285e6.tar.gz
frameworks_native-6a26be7c2b1e5a84b5d2105780148016889285e6.tar.bz2
CpuConsumer: lock buffers that could be YUV as ycbcr
Bug: 17906609 Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
Diffstat (limited to 'include/gui')
-rw-r--r--include/gui/CpuConsumer.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/gui/CpuConsumer.h b/include/gui/CpuConsumer.h
index 6f4c2ec..4c6822a 100644
--- a/include/gui/CpuConsumer.h
+++ b/include/gui/CpuConsumer.h
@@ -54,8 +54,12 @@ class CpuConsumer : public ConsumerBase
uint32_t scalingMode;
int64_t timestamp;
uint64_t frameNumber;
- // Values below are only valid when using
- // HAL_PIXEL_FORMAT_YCbCr_420_888, in which case LockedBuffer::data
+ // this is the same as format, except for formats that are compatible with
+ // a flexible format (e.g. HAL_PIXEL_FORMAT_YCbCr_420_888). In the latter
+ // case this contains that flexible format
+ PixelFormat flexFormat;
+ // Values below are only valid when using HAL_PIXEL_FORMAT_YCbCr_420_888
+ // or compatible format, in which case LockedBuffer::data
// contains the Y channel, and stride is the Y channel stride. For other
// formats, these will all be 0.
uint8_t *dataCb;