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

Commit a4196f5e authored by David Staessens's avatar David Staessens Committed by Automerger Merge Worker
Browse files

Merge "v4l2_codec2: Add VP8 profiles to C2Config::profile_t." am: 12323b43 am: d0a0e4e6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1679426

Change-Id: Ica308913a304ecadeeb1e9255c77ea0fb903629c
parents 4969d96c d0a0e4e6

media/codec2/core/include/C2Config.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -394,6 +394,7 @@ enum : uint32_t { 
    _C2_PL_VP9_BASE  = 0x7000,

    _C2_PL_VP9_BASE  = 0x7000,

    _C2_PL_DV_BASE   = 0x8000,

    _C2_PL_DV_BASE   = 0x8000,

    _C2_PL_AV1_BASE  = 0x9000,

    _C2_PL_AV1_BASE  = 0x9000,

    _C2_PL_VP8_BASE  = 0xA000,





    C2_PROFILE_LEVEL_VENDOR_START = 0x70000000,

    C2_PROFILE_LEVEL_VENDOR_START = 0x70000000,

};

};
@@ -547,6 +548,12 @@ enum C2Config::profile_t : uint32_t { 
    PROFILE_AV1_0 = _C2_PL_AV1_BASE,            ///< AV1 Profile 0 (4:2:0, 8 to 10 bit)

    PROFILE_AV1_0 = _C2_PL_AV1_BASE,            ///< AV1 Profile 0 (4:2:0, 8 to 10 bit)

    PROFILE_AV1_1,                              ///< AV1 Profile 1 (8 to 10 bit)

    PROFILE_AV1_1,                              ///< AV1 Profile 1 (8 to 10 bit)

    PROFILE_AV1_2,                              ///< AV1 Profile 2 (8 to 12 bit)

    PROFILE_AV1_2,                              ///< AV1 Profile 2 (8 to 12 bit)



    // VP8 profiles

    PROFILE_VP8_0 = _C2_PL_VP8_BASE,            ///< VP8 Profile 0

    PROFILE_VP8_1,                              ///< VP8 Profile 1

    PROFILE_VP8_2,                              ///< VP8 Profile 2

    PROFILE_VP8_3,                              ///< VP8 Profile 3

};

};





enum C2Config::level_t : uint32_t {

enum C2Config::level_t : uint32_t {