Merge "C2SoftMpeg4Dec: Fix memory leak in onRelease" am: 9323cb4839 am:... (e4a62288) · Commits · e / os / android_frameworks_av

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() {