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

Commit 2b2af529 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "stagefright: remove CHECKs in convertMetaDataToMessage"

parents 2961a353 f4101f74

media/libstagefright/AwesomePlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1274,7 +1274,7 @@ void AwesomePlayer::initRenderer_l() { 
        // then performs a color conversion and copy to get the data

        // into the ANativeBuffer.

        sp<AMessage> format;

        convertMetaDataToMessage(meta, &format);

        CHECK(OK == convertMetaDataToMessage(meta, &format));

        mVideoRenderer = new AwesomeLocalRenderer(mNativeWindow, format);

    }

}

media/libstagefright/Utils.cpp

+14 −6
Original line number Diff line number Diff line
@@ -101,7 +101,9 @@ status_t convertMetaDataToMessage( 
    }



    const char *mime;

    CHECK(meta->findCString(kKeyMIMEType, &mime));

    if (!meta->findCString(kKeyMIMEType, &mime)) {

        return BAD_VALUE;

    }



    sp<AMessage> msg = new AMessage;

    msg->setString("mime", mime);
@@ -123,8 +125,10 @@ status_t convertMetaDataToMessage( 


    if (!strncasecmp("video/", mime, 6)) {

        int32_t width, height;

        CHECK(meta->findInt32(kKeyWidth, &width));

        CHECK(meta->findInt32(kKeyHeight, &height));

        if (!meta->findInt32(kKeyWidth, &width)

                || !meta->findInt32(kKeyHeight, &height)) {

            return BAD_VALUE;

        }



        msg->setInt32("width", width);

        msg->setInt32("height", height);
@@ -156,8 +160,10 @@ status_t convertMetaDataToMessage( 
        }

    } else if (!strncasecmp("audio/", mime, 6)) {

        int32_t numChannels, sampleRate;

        CHECK(meta->findInt32(kKeyChannelCount, &numChannels));

        CHECK(meta->findInt32(kKeySampleRate, &sampleRate));

        if (!meta->findInt32(kKeyChannelCount, &numChannels)

                || !meta->findInt32(kKeySampleRate, &sampleRate)) {

            return BAD_VALUE;

        }



        msg->setInt32("channel-count", numChannels);

        msg->setInt32("sample-rate", sampleRate);
@@ -380,7 +386,9 @@ status_t convertMetaDataToMessage( 


    } else if (meta->findData(kKeyESDS, &type, &data, &size)) {

        ESDS esds((const char *)data, size);

        CHECK_EQ(esds.InitCheck(), (status_t)OK);

        if (esds.InitCheck() != (status_t)OK) {

            return BAD_VALUE;

        }



        const void *codec_specific_data;

        size_t codec_specific_data_size;