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

Commit 0f0fb947 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Codec2Buffer: accept RGB/RGBA MediaImage layouts" am: 19925b00 am:... 

Merge "Codec2Buffer: accept RGB/RGBA MediaImage layouts" am: 19925b00 am: 4709170d am: c855e56a am: 9f1d3483

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



Change-Id: I84fed7dadfbc7036421d869873806190e5a7ca46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db806bcd 9f1d3483

media/codec2/sfplugin/Codec2Buffer.cpp

+47 −10
Original line number Diff line number Diff line
@@ -478,19 +478,56 @@ public: 
                mInitCheck = NO_INIT;

                return;

            case C2PlanarLayout::TYPE_RGB:

                mediaImage->mType = MediaImage2::MEDIA_IMAGE_TYPE_RGB;

                // TODO: support MediaImage layout

                switch (mClientColorFormat) {

                    case COLOR_FormatSurface:

                    case COLOR_FormatRGBFlexible:

                    case COLOR_Format24bitBGR888:

                    case COLOR_Format24bitRGB888:

                        ALOGD("Converter: accept color format "

                                "(client %d component %d) for RGB layout",

                                mClientColorFormat, mComponentColorFormat);

                        break;

                    default:

                        ALOGD("Converter: unrecognized color format "

                                "(client %d component %d) for RGB layout",

                                mClientColorFormat, mComponentColorFormat);

                mInitCheck = NO_INIT;

                // TODO: support MediaImage layout

                        mInitCheck = BAD_VALUE;

                        return;

                }

                if (layout.numPlanes != 3) {

                    ALOGD("Converter: %d planes for RGB layout", layout.numPlanes);

                    mInitCheck = BAD_VALUE;

                    return;

                }

                break;

            case C2PlanarLayout::TYPE_RGBA:

                mediaImage->mType = MediaImage2::MEDIA_IMAGE_TYPE_RGBA;

                // TODO: support MediaImage layout

                switch (mClientColorFormat) {

                    case COLOR_FormatSurface:

                    case COLOR_FormatRGBAFlexible:

                    case COLOR_Format32bitABGR8888:

                    case COLOR_Format32bitARGB8888:

                    case COLOR_Format32bitBGRA8888:

                        ALOGD("Converter: accept color format "

                                "(client %d component %d) for RGBA layout",

                                mClientColorFormat, mComponentColorFormat);

                        break;

                    default:

                        ALOGD("Converter: unrecognized color format "

                                "(client %d component %d) for RGBA layout",

                                mClientColorFormat, mComponentColorFormat);

                mInitCheck = NO_INIT;

                // TODO: support MediaImage layout

                        mInitCheck = BAD_VALUE;

                        return;

                }

                if (layout.numPlanes != 4) {

                    ALOGD("Converter: %d planes for RGBA layout", layout.numPlanes);

                    mInitCheck = BAD_VALUE;

                    return;

                }

                break;

            default:

                mediaImage->mType = MediaImage2::MEDIA_IMAGE_TYPE_UNKNOWN;

                if (layout.numPlanes == 1) {