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

Commit d19d5cfb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftMpeg4Dec: Fix memory leak in onRelease" am: 9323cb48 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1794110

Change-Id: I1f87f59108f90e113019d494939e4a3970566a0d
parents ca5dfc3c 9323cb48

media/codec2/components/mpeg4_h263/C2SoftMpeg4Dec.cpp

+6 −17
Original line number Diff line number Diff line
@@ -243,12 +243,14 @@ c2_status_t C2SoftMpeg4Dec::onInit() { 
}



c2_status_t C2SoftMpeg4Dec::onStop() {

    if (mInitialized) {

    if (mDecHandle) {

        if (mInitialized) {

            PVCleanUpVideoDecoder(mDecHandle);

        }

            mInitialized = false;

        }

        delete mDecHandle;

        mDecHandle = nullptr;

    }

    for (int32_t i = 0; i < kNumOutputBuffers; ++i) {

        if (mOutputBuffer[i]) {

            free(mOutputBuffer[i]);
@@ -269,23 +271,10 @@ void C2SoftMpeg4Dec::onReset() { 
}



void C2SoftMpeg4Dec::onRelease() {

    if (mInitialized) {

        if (mDecHandle) {

            PVCleanUpVideoDecoder(mDecHandle);

            delete mDecHandle;

            mDecHandle = nullptr;

        }

        mInitialized = false;

    }

    (void)onStop();

    if (mOutBlock) {

        mOutBlock.reset();

    }

    for (int32_t i = 0; i < kNumOutputBuffers; ++i) {

        if (mOutputBuffer[i]) {

            free(mOutputBuffer[i]);

            mOutputBuffer[i] = nullptr;

        }

    }

}



c2_status_t C2SoftMpeg4Dec::onFlush_sm() {