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

Commit 9985754c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Address comments on previous CL"

parents f8219e1b 4ead95ed

media/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ MPEG4Extractor::MPEG4Extractor(DataSourceHelper *source, const char *mime) 
    : mMoofOffset(0),

      mMoofFound(false),

      mMdatFound(false),

      mDataSource(new DataSourceHelper(source)),

      mDataSource(source),

      mCachedSource(NULL),

      mInitCheck(NO_INIT),

      mHeaderTimescale(0),

media/extractors/ogg/OggExtractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,7 @@ OggExtractor::OggExtractor(DataSourceHelper *source) 
OggExtractor::~OggExtractor() {

    delete mImpl;

    mImpl = NULL;

    delete mDataSource;

}



size_t OggExtractor::countTracks() {

media/extractors/wav/WAVExtractor.cpp

+1 −3
Original line number Diff line number Diff line
@@ -568,16 +568,14 @@ static CreatorFunc Sniff( 
        return NULL;

    }



    WAVExtractor *extractor = new WAVExtractor(helper);

    WAVExtractor *extractor = new WAVExtractor(helper); // extractor owns the helper

    int numTracks = extractor->countTracks();

    delete extractor;

    if (numTracks == 0) {

        delete helper;

        return NULL;

    }



    *confidence = 0.3f;

    delete helper;



    return CreateExtractor;

}

media/libstagefright/MediaExtractorFactory.cpp

+2 −1
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ CreatorFunc MediaExtractorFactory::sniff( 
        float newConfidence;

        void *newMeta = nullptr;

        FreeMetaFunc newFreeMeta = nullptr;

        if ((curCreator = (*it)->def.sniff(source->wrap(), &newConfidence, &newMeta, &newFreeMeta))) {

        if ((curCreator = (*it)->def.sniff(

                        source->wrap(), &newConfidence, &newMeta, &newFreeMeta))) {

            if (newConfidence > *confidence) {

                *confidence = newConfidence;

                if (*meta != nullptr && *freeMeta != nullptr) {