diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-19 16:10:43 -0800 |
---|---|---|
committer | Dan Stoza <stoza@google.com> | 2015-03-19 13:56:00 -0700 |
commit | 82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02 (patch) | |
tree | 5ae0c4334682e0f5ca86328ec0b69a00ca421355 /services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | |
parent | ad36432de81c4c88d726680b7c52e8357df98455 (diff) | |
download | frameworks_native-82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02.zip frameworks_native-82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02.tar.gz frameworks_native-82c6bcc9705eabcaf5b9e45bc81867b0e2d61a02.tar.bz2 |
DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.
- Wire up new dataSpace parameter through buffer queue stack
- Update tests to include the parameter
- Switch eglApi to using dataSpace to indicate sRGB gamma/linear
difference
- Remove RAW_SENSOR in favor of RAW16
- Remove use of sRGB format enums
- Add default dataspace to buffer queue core
- Add query for default dataspace
Cherry pick of I070bd2e7c56506055c419004c29e2e3feac725df
Change-Id: I461952389c18051176c6b75e664f20ad369f5760
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp')
-rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index ef10fa7..aefa8fd 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -234,6 +234,7 @@ void VirtualDisplaySurface::onFrameCommitted() { status_t result = mSource[SOURCE_SINK]->queueBuffer(sslot, QueueBufferInput( systemTime(), false /* isAutoTimestamp */, + HAL_DATASPACE_UNKNOWN, Rect(mSinkBufferWidth, mSinkBufferHeight), NATIVE_WINDOW_SCALING_MODE_FREEZE, 0 /* transform */, true /* async*/, @@ -453,12 +454,13 @@ status_t VirtualDisplaySurface::queueBuffer(int pslot, // Extract the GLES release fence for HWC to acquire int64_t timestamp; bool isAutoTimestamp; + android_dataspace dataSpace; Rect crop; int scalingMode; uint32_t transform; bool async; - input.deflate(×tamp, &isAutoTimestamp, &crop, &scalingMode, - &transform, &async, &mFbFence); + input.deflate(×tamp, &isAutoTimestamp, &dataSpace, &crop, + &scalingMode, &transform, &async, &mFbFence); mFbProducerSlot = pslot; mOutputFence = mFbFence; |