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

Commit 28452eda authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix memory leak in MPEG2PSExtractor" am: 52a42dde am: 8f56bd1e 

am: fada886d

Change-Id: Ie2b16301a4e7fa9d6b5d1f598ad123df42dfe989
parents c0c54e13 fada886d

media/extractors/mpeg2/MPEG2PSExtractor.cpp

+9 −1
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ MPEG2PSExtractor::MPEG2PSExtractor(DataSourceHelper *source) 
    AMediaFormat *meta = AMediaFormat_new();

    for (size_t i = mTracks.size(); i > 0;) {

        i--;

        if (mTracks.valueAt(i)->getFormat(meta) != AMEDIA_OK) {

        Track *track = mTracks.valueAt(i);

        if (track->getFormat(meta) != AMEDIA_OK) {

            mTracks.removeItemsAt(i);

            delete track;

        }

    }

    AMediaFormat_delete(meta);
@@ -122,6 +124,10 @@ MPEG2PSExtractor::MPEG2PSExtractor(DataSourceHelper *source) 


MPEG2PSExtractor::~MPEG2PSExtractor() {

    delete mDataSource;

    for (size_t i = mTracks.size(); i > 0;) {

        i--;

        delete mTracks.valueAt(i);

    }

}



size_t MPEG2PSExtractor::countTracks() {
@@ -793,7 +799,9 @@ MPEG2PSExtractor::WrappedTrack::~WrappedTrack() { 
}



media_status_t MPEG2PSExtractor::WrappedTrack::start() {

    delete mTrack->mBufferGroup;

    mTrack->mBufferGroup = mBufferGroup;

    mBufferGroup = nullptr;

    return mTrack->start();

}