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

Commit 865e9c4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "codec2: skip adding new color formats for older vendor images" into... 

Merge "codec2: skip adding new color formats for older vendor images" into tm-dev am: 89324d36 am: f847b39f

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



Change-Id: Id9592aa8c672e1b0c4ed67a3b19ef586d625ba60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efd3dd51 f847b39f

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+7 −2
Original line number Diff line number Diff line
@@ -309,11 +309,16 @@ void addSupportedColorFormats( 
        if (trait.name.find("android") != std::string::npos) {

            addDefaultColorFormat(COLOR_FormatSurface);

        }



        static const int kVendorSdkVersion = ::android::base::GetIntProperty(

                "ro.vendor.build.version.sdk", android_get_device_api_level());

        if (kVendorSdkVersion >= __ANDROID_API_T__) {

            for (int32_t colorFormat : supportedColorFormats) {

                caps->addColorFormat(colorFormat);

            }

        }

    }

}



class Switch {

    enum Flags : uint8_t {