Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63e8376d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Zhijun He
Browse files

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

Change-Id: I070bd2e7c56506055c419004c29e2e3feac725df
parent 28dbde32

include/gui/BufferItem.h

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ class BufferItem : public Flattenable<BufferItem> { 
    // automatically when the buffer was queued.

    bool mIsAutoTimestamp;



    // mDataSpace is the current dataSpace value for this buffer slot. This gets

    // set by queueBuffer each time this slot is queued. The meaning of the

    // dataSpace is format-dependent.

    android_dataspace mDataSpace;



    // mFrameNumber is the number of the queued frame for this slot.

    uint64_t mFrameNumber;

include/gui/BufferItemConsumer.h

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ class BufferItemConsumer: public ConsumerBase 
    // GraphicBuffers of a defaultFormat if no format is specified

    // in dequeueBuffer

    status_t setDefaultBufferFormat(uint32_t defaultFormat);



    // setDefaultBufferDataSpace allows the BufferQueue to create

    // GraphicBuffers of a defaultDataSpace if no data space is specified

    // in queueBuffer.

    // The initial default is HAL_DATASPACE_UNKNOWN

    status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace);

};



} // namespace android

include/gui/BufferQueueConsumer.h

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,13 @@ public: 
    // initial default is HAL_PIXEL_FORMAT_RGBA_8888.

    virtual status_t setDefaultBufferFormat(uint32_t defaultFormat);



    // setDefaultBufferDataSpace allows the BufferQueue to create

    // GraphicBuffers of a defaultDataSpace if no data space is specified

    // in queueBuffer.

    // The initial default is HAL_DATASPACE_UNKNOWN

    virtual status_t setDefaultBufferDataSpace(

            android_dataspace defaultDataSpace);



    // setConsumerUsageBits will turn on additional usage bits for dequeueBuffer.

    // These are merged with the bits passed to dequeueBuffer.  The values are

    // enumerated in gralloc.h, e.g. GRALLOC_USAGE_HW_RENDER; the default is 0.

include/gui/BufferQueueCore.h

+5 −0
Original line number Diff line number Diff line
@@ -209,6 +209,11 @@ private: 
    // in dequeueBuffer if a width and height of 0 are specified.

    int mDefaultHeight;



    // mDefaultBufferDataSpace holds the default dataSpace of queued buffers.

    // It is used in queueBuffer if a dataspace of 0 (HAL_DATASPACE_UNKNOWN)

    // is specified.

    android_dataspace mDefaultBufferDataSpace;



    // mDefaultMaxBufferCount is the default limit on the number of buffers that

    // will be allocated at one time. This default limit is set by the consumer.

    // The limit (as opposed to the default limit) may be overriden by the

include/gui/CpuConsumer.h

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class CpuConsumer : public ConsumerBase 
        uint32_t    transform;

        uint32_t    scalingMode;

        int64_t     timestamp;

        android_dataspace dataSpace;

        uint64_t    frameNumber;

        // 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
@@ -91,6 +92,12 @@ class CpuConsumer : public ConsumerBase 
    // HAL_PIXEL_FORMAT_RGBA_8888.

    status_t setDefaultBufferFormat(uint32_t defaultFormat);



    // setDefaultBufferDataSpace allows the BufferQueue to create

    // GraphicBuffers of a defaultDataSpace if no data space is specified

    // in queueBuffer.

    // The initial default is HAL_DATASPACE_UNKNOWN

    status_t setDefaultBufferDataSpace(android_dataspace defaultDataSpace);



    // Gets the next graphics buffer from the producer and locks it for CPU use,

    // filling out the passed-in locked buffer structure with the native pointer

    // and metadata. Returns BAD_VALUE if no new buffer is available, and