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

Commit 21b70101 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Fix error handling for unknown codecs" into oc-mr1-dev 

am: 1e0c671e

Change-Id: I63dffdcb809b39fbd649710a948bab9e7e35a8a0
parents 0c2c20e7 1e0c671e

media/libstagefright/ACodec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -6356,12 +6356,14 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { 
            ALOGE("Unable to obtain MediaCodecList while "

                    "attempting to create codec \"%s\"",

                    componentName.c_str());

            mCodec->signalError(OMX_ErrorUndefined, NO_INIT);

            return false;

        }

        ssize_t index = list->findCodecByName(componentName.c_str());

        if (index < 0) {

            ALOGE("Unable to find codec \"%s\"",

                    componentName.c_str());

            mCodec->signalError(OMX_ErrorInvalidComponent, NAME_NOT_FOUND);

            return false;

        }

        sp<MediaCodecInfo> info = list->getCodecInfo(index);
@@ -6369,6 +6371,7 @@ bool ACodec::UninitializedState::onAllocateComponent(const sp<AMessage> &msg) { 
            ALOGE("Unexpected error (index out-of-bound) while "

                    "retrieving information for codec \"%s\"",

                    componentName.c_str());

            mCodec->signalError(OMX_ErrorUndefined, UNKNOWN_ERROR);

            return false;

        }

        matchingCodecs.add(info->getCodecName());