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

Commit e370bb62 authored by Andreas Huber's avatar Andreas Huber
Browse files

Bump up the max number of items in an AMessage, remove overly stringent 

CHECK() limiting us to just audio/* or video/* tracks.

related-to-bug: 6399405
Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
parent e4f70a7e

include/media/stagefright/foundation/AMessage.h

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ private: 
    };



    enum {

        kMaxNumItems = 32

        kMaxNumItems = 64

    };

    Item mItems[kMaxNumItems];

    size_t mNumItems;

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+1 −3
Original line number Diff line number Diff line
@@ -116,9 +116,7 @@ sp<AMessage> NuPlayer::Decoder::makeFormat(const sp<MetaData> &meta) { 


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

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

    } else {

        CHECK(!strncasecmp("audio/", mime, 6));



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

        int32_t numChannels, sampleRate;

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

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

media/libstagefright/NuMediaExtractor.cpp

+1 −3
Original line number Diff line number Diff line
@@ -198,9 +198,7 @@ status_t NuMediaExtractor::getTrackFormat( 


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

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

    } else {

        CHECK(!strncasecmp("audio/", mime, 6));



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

        int32_t numChannels, sampleRate;

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

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