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

Commit fa678bfb authored by Ray Essick's avatar Ray Essick
Browse files

Fix extractor plugin parameter handling 

several extractors weren't returning proper status for invalid parameters.

Bug: 179062958
Test: atest ExtractorUnitTest -- --enable-module-dynamic-download=true
Change-Id: Ie3c63da19ae82a2c78e0fb83a727579f09ce8ad1
parent d1c8d9c5

media/extractors/mp3/MP3Extractor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -425,8 +425,7 @@ media_status_t MP3Extractor::getTrackMetaData( 
    if (mInitCheck != OK || index != 0) {

        return AMEDIA_ERROR_UNKNOWN;

    }

    AMediaFormat_copy(meta, mMeta);

    return AMEDIA_OK;

    return AMediaFormat_copy(meta, mMeta);

}



////////////////////////////////////////////////////////////////////////////////

media/extractors/mp4/MPEG4Extractor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -640,8 +640,7 @@ media_status_t MPEG4Extractor::getTrackMetaData( 
        }

    }



    AMediaFormat_copy(meta, track->meta);

    return AMEDIA_OK;

    return AMediaFormat_copy(meta, track->meta);

}



status_t MPEG4Extractor::readMetaData() {

media/extractors/mpeg2/MPEG2TSExtractor.cpp

+3 −0
Original line number Diff line number Diff line
@@ -268,6 +268,9 @@ MediaTrackHelper *MPEG2TSExtractor::getTrack(size_t index) { 
media_status_t MPEG2TSExtractor::getTrackMetaData(

        AMediaFormat *meta,

        size_t index, uint32_t /* flags */) {

    if (meta == nullptr) {

        return AMEDIA_ERROR_INVALID_PARAMETER;

    }

    sp<MetaData> implMeta = index < mSourceImpls.size()

        ? mSourceImpls.editItemAt(index)->getFormat() : NULL;

    if (implMeta == NULL) {