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

Commit edd8ea3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iee37bb97,If7c549b8 am: 83ea817a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2359329



Change-Id: I3b0d23d69f350fe84e41e02d51eb81d691bdb252
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 597f7b8c 83ea817a

graphics/common/aidl/android/hardware/graphics/common/StandardMetadataType.aidl

+3 −3
Original line number Original line Diff line number Diff line
@@ -22,9 +22,9 @@ package android.hardware.graphics.common; 
 * This is an enum that defines the common types of gralloc 4 buffer metadata. The comments for

 * This is an enum that defines the common types of gralloc 4 buffer metadata. The comments for

 * each enum include a description of the metadata that is associated with the type.

 * each enum include a description of the metadata that is associated with the type.

 *

 *

 * IMapper@4.x must support getting the following standard buffer metadata types, with the exception

 * IMapper@4.x & later must support getting the following standard buffer metadata types, with the

 * of SMPTE 2094-10 metadata. IMapper@4.x may support setting these standard buffer metadata types

 * exception of SMPTE 2094-10 and SMPTE 2094-40 metadata. IMapper@4.x & later may support setting

 * as well.

 * these standard buffer metadata types as well.

 *

 *

 * When encoding these StandardMetadataTypes into a byte stream, the associated MetadataType is

 * When encoding these StandardMetadataTypes into a byte stream, the associated MetadataType is

 * is first encoded followed by the StandardMetadataType value. The MetadataType is encoded by

 * is first encoded followed by the StandardMetadataType value. The MetadataType is encoded by

graphics/mapper/stable-c/Android.bp

+4 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,10 @@ cc_test { 
    srcs: [

    srcs: [

        "implutils/impltests.cpp",

        "implutils/impltests.cpp",

    ],

    ],

    shared_libs: [

        "libgralloctypes",

        "libhidlbase",

    ],

    visibility: [":__subpackages__"],

    visibility: [":__subpackages__"],

    cpp_std: "experimental",

    cpp_std: "experimental",

}

}

graphics/mapper/stable-c/implutils/impltests.cpp

+290 −70

File changed.

Preview size limit exceeded, changes collapsed.

graphics/mapper/stable-c/implutils/include/android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h

+86 −39

File changed.

Preview size limit exceeded, changes collapsed.

graphics/mapper/stable-c/include/android/hardware/graphics/mapper/IMapper.h

+12 −10
Original line number Original line Diff line number Diff line
@@ -509,11 +509,12 @@ typedef struct AIMapperV5 { 
     * particular Metadata field.

     * particular Metadata field.

     *

     *

     * The framework will attempt to set the following StandardMetadataType

     * The framework will attempt to set the following StandardMetadataType

     * values: DATASPACE, SMPTE2086, CTA861_3, SMPTE2094_40 and BLEND_MODE.

     * values: DATASPACE, SMPTE2086, CTA861_3, and BLEND_MODE.

     * We require everyone to support setting those fields. If a device's Composer

     * We require everyone to support setting those fields. Framework will also attempt to set

     * implementation supports a field, it should be supported here. Over time these

     * SMPTE2094_40 and SMPTE2094_10 if available, and it is required to support setting those

     * metadata fields will be moved out of Composer/BufferQueue/etc. and into the

     * if it is possible to get them. If a device's Composer implementation supports a field,

     * buffer's Metadata fields.

     * it should be supported here. Over time these metadata fields will be moved out of

     * Composer/BufferQueue/etc. and into the buffer's Metadata fields.

     *

     *

     * @param buffer Buffer receiving desired metadata

     * @param buffer Buffer receiving desired metadata

     * @param metadataType MetadataType for the metadata value being set

     * @param metadataType MetadataType for the metadata value being set
@@ -546,11 +547,12 @@ typedef struct AIMapperV5 { 
     * particular Metadata field.

     * particular Metadata field.

     *

     *

     * The framework will attempt to set the following StandardMetadataType

     * The framework will attempt to set the following StandardMetadataType

     * values: DATASPACE, SMPTE2086, CTA861_3, SMPTE2094_40 and BLEND_MODE.

     * values: DATASPACE, SMPTE2086, CTA861_3, and BLEND_MODE.

     * We require everyone to support setting those fields. If a device's Composer

     * We require everyone to support setting those fields. Framework will also attempt to set

     * implementation supports a field, it should be supported here. Over time these

     * SMPTE2094_40 and SMPTE2094_10 if available, and it is required to support setting those

     * metadata fields will be moved out of Composer/BufferQueue/etc. and into the

     * if it is possible to get them. If a device's Composer implementation supports a field,

     * buffer's Metadata fields.

     * it should be supported here. Over time these metadata fields will be moved out of

     * Composer/BufferQueue/etc. and into the buffer's Metadata fields.

     *

     *

     * @param buffer Buffer receiving desired metadata

     * @param buffer Buffer receiving desired metadata

     * @param standardMetadataType StandardMetadataType for the metadata value being set

     * @param standardMetadataType StandardMetadataType for the metadata value being set