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

Commit 8d4e68ff authored by Kevin DuBois's avatar Kevin DuBois Committed by Android (Google) Code Review
Browse files

Merge "graphics.common: add HSV format definition to 1.2"

parents 16337343 97e1a932

configstore/1.2/ISurfaceFlingerConfigs.hal

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package android.hardware.configstore@1.2;



import android.hardware.graphics.common@1.1::PixelFormat;

import android.hardware.graphics.common@1.2::PixelFormat;

import android.hardware.graphics.common@1.2::Dataspace;

import @1.1::ISurfaceFlingerConfigs;

import @1.0::OptionalBool;

configstore/1.2/default/SurfaceFlingerConfigs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ namespace configstore { 
namespace V1_2 {

namespace implementation {



using ::android::hardware::graphics::common::V1_1::PixelFormat;

using ::android::hardware::graphics::common::V1_2::Dataspace;

using ::android::hardware::graphics::common::V1_2::PixelFormat;



// ::android::hardware::configstore::V1_0::ISurfaceFlingerConfigs implementation.

Return<void> SurfaceFlingerConfigs::vsyncEventPhaseOffsetNs(vsyncEventPhaseOffsetNs_cb _hidl_cb) {

configstore/1.2/vts/functional/VtsHalConfigstoreV1_2TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ using ::android::hardware::Void; 
using ::android::hardware::configstore::V1_0::OptionalBool;

using ::android::hardware::configstore::V1_0::OptionalInt64;

using ::android::hardware::configstore::V1_0::OptionalUInt64;

using ::android::hardware::configstore::V1_2::ISurfaceFlingerConfigs;

using ::android::hardware::configstore::V1_2::DisplayPrimaries;

using ::android::hardware::graphics::common::V1_1::PixelFormat;

using ::android::hardware::configstore::V1_2::ISurfaceFlingerConfigs;

using ::android::hardware::graphics::common::V1_2::Dataspace;

using ::android::hardware::graphics::common::V1_2::PixelFormat;



#define ASSERT_OK(ret) ASSERT_TRUE(ret.isOk())

#define EXPECT_OK(ret) EXPECT_TRUE(ret.isOk())

graphics/common/1.2/types.hal

+17 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ import @1.1::PixelFormat; 
/**

 * Hdr

 */

@export(name="android_hdr_v1_2_t", value_prefix="HAL_HDR_")

@export(name="android_hdr_v1_2_t", value_prefix="HAL_HDR_",

        export_parent="false")

enum Hdr : @1.0::Hdr {

    HDR10_PLUS = 4,

};
@@ -96,3 +97,18 @@ struct HardwareBuffer { 
 */

typedef int32_t[4] Rect;



/**

 * Pixel formats for graphics buffers.

 */

@export(name="android_pixel_format_v1_2_t", value_prefix="HAL_PIXEL_FORMAT_",

        export_parent="false")

enum PixelFormat : @1.1::PixelFormat {

    /**

     * 24-bit format that has 8-bit H, S, and V components, in that order,

     * from the lowest memory address to the highest memory address.

     *

     * The component values are unsigned normalized to the range [0, 1], whose

     * interpretation is defined by the dataspace.

    */

    HSV_888 = 0x37,

};

graphics/composer/2.3/IComposerClient.hal

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.hardware.graphics.composer@2.3;



import android.hardware.graphics.common@1.1::RenderIntent;

import android.hardware.graphics.common@1.1::PixelFormat;

import android.hardware.graphics.common@1.2::PixelFormat;

import android.hardware.graphics.common@1.2::ColorMode;

import android.hardware.graphics.common@1.2::Dataspace;

import android.hardware.graphics.common@1.2::Hdr;