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

Commit 175766c8 authored by Romain Guy's avatar Romain Guy
Browse files

Prevent conflict with deprecated pixel format constants

Bug: 32984164
Test: Compile
Change-Id: I9c3a1cdf0dbd498379453a982ac2a92aabb532b6
parent ffdab750
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ enum PixelFormat : int32_t {
    /*
     * The following formats use a 16bit float per color component.
     */
    RGBA_FP16          = 0x10,
    RGBX_FP16          = 0x11,
    RGBA_FP16          = 0x16,
    RGBX_FP16          = 0x17,

    /*
     * 0x100 - 0x1FF
     * 0x101 - 0x1FF
     *
     * This range is reserved for pixel formats that are specific to the HAL
     * implementation.  Implementations can use any value in this range to
@@ -425,6 +425,7 @@ enum PixelFormat : int32_t {
    YCBCR_422_SP       = 0x10,  // NV16
    YCRCB_420_SP       = 0x11,  // NV21
    YCBCR_422_I        = 0x14,  // YUY2
    JPEG               = 0x100,
};

/**