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

Commit 142c4994 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808,... 

Merge cherrypicks of [8549820, 8549668, 8549613, 8549614, 8549935, 8549808, 8549876, 8549809, 8549552] into qt-release

Change-Id: I43eff6782e25da76be71460fdf07f992a15e5c39
parents 162ba6e9 16915d7b

media/codec2/sfplugin/Codec2InfoBuilder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ void addSupportedColorFormats( 
    // TODO: get this from intf() as well, but how do we map them to

    // MediaCodec color formats?

    bool encoder = trait.kind == C2Component::KIND_ENCODER;

    if (mediaType.find("video") != std::string::npos) {

    if (mediaType.find("video") != std::string::npos

            || mediaType.find("image") != std::string::npos) {

        // vendor video codecs prefer opaque format

        if (trait.name.find("android") == std::string::npos) {

            caps->addColorFormat(COLOR_FormatSurface);