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

Commit 7cda1550 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "stagefright/codec2: add av1 level enum reflections"

parents b8cff55c 182a03fb

media/codec2/core/include/C2Config.h

+2 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ enum C2Config::level_t : uint32_t { 
    LEVEL_VP9_6_1,                              ///< VP9 Level 6.1

    LEVEL_VP9_6_2,                              ///< VP9 Level 6.2



    // Dolby Vision level

    // Dolby Vision levels

    LEVEL_DV_MAIN_HD_24 = _C2_PL_DV_BASE,       ///< Dolby Vision main tier hd24

    LEVEL_DV_MAIN_HD_30,                        ///< Dolby Vision main tier hd30

    LEVEL_DV_MAIN_FHD_24,                       ///< Dolby Vision main tier fhd24
@@ -659,6 +659,7 @@ enum C2Config::level_t : uint32_t { 
    LEVEL_DV_HIGH_UHD_48,                       ///< Dolby Vision high tier uhd48

    LEVEL_DV_HIGH_UHD_60,                       ///< Dolby Vision high tier uhd60



    // AV1 levels

    LEVEL_AV1_2    = _C2_PL_AV1_BASE ,          ///< AV1 Level 2

    LEVEL_AV1_2_1,                              ///< AV1 Level 2.1

    LEVEL_AV1_2_2,                              ///< AV1 Level 2.2

media/codec2/vndk/C2Config.cpp

+24 −0
Original line number Diff line number Diff line
@@ -221,6 +221,30 @@ DEFINE_C2_ENUM_VALUE_CUSTOM_HELPER(C2Config::level_t, ({ 
        { "vp9-6", C2Config::LEVEL_VP9_6 },

        { "vp9-6.1", C2Config::LEVEL_VP9_6_1 },

        { "vp9-6.2", C2Config::LEVEL_VP9_6_2 },

        { "av1-2", C2Config::LEVEL_AV1_2 },

        { "av1-2.1", C2Config::LEVEL_AV1_2_1 },

        { "av1-2.2", C2Config::LEVEL_AV1_2_2 },

        { "av1-2.3", C2Config::LEVEL_AV1_2_3 },

        { "av1-3", C2Config::LEVEL_AV1_3 },

        { "av1-3.1", C2Config::LEVEL_AV1_3_1 },

        { "av1-3.2", C2Config::LEVEL_AV1_3_2 },

        { "av1-3.3", C2Config::LEVEL_AV1_3_3 },

        { "av1-4", C2Config::LEVEL_AV1_4 },

        { "av1-4.1", C2Config::LEVEL_AV1_4_1 },

        { "av1-4.2", C2Config::LEVEL_AV1_4_2 },

        { "av1-4.3", C2Config::LEVEL_AV1_4_3 },

        { "av1-5", C2Config::LEVEL_AV1_5 },

        { "av1-5.1", C2Config::LEVEL_AV1_5_1 },

        { "av1-5.2", C2Config::LEVEL_AV1_5_2 },

        { "av1-5.3", C2Config::LEVEL_AV1_5_3 },

        { "av1-6", C2Config::LEVEL_AV1_6 },

        { "av1-6.1", C2Config::LEVEL_AV1_6_1 },

        { "av1-6.2", C2Config::LEVEL_AV1_6_2 },

        { "av1-6.3", C2Config::LEVEL_AV1_6_3 },

        { "av1-7", C2Config::LEVEL_AV1_7 },

        { "av1-7.1", C2Config::LEVEL_AV1_7_1 },

        { "av1-7.2", C2Config::LEVEL_AV1_7_2 },

        { "av1-7.3", C2Config::LEVEL_AV1_7_3 },

}))



DEFINE_C2_ENUM_VALUE_CUSTOM_HELPER(C2BufferData::type_t, ({