Fix for issue 3372755 : File descriptor leak (3ad01762) · Commits · e / os / android_frameworks_av

libvideoeditor/lvpp/VideoEditorSRC.cpp

+0 −13

Original line number	Diff line number	Diff line
		@@ -103,10 +103,6 @@ void VideoEditorSRC::setResampling(int32_t sampleRate) {
		return;
		}

		// debug
		FILE *fp;


		status_t VideoEditorSRC::start (MetaData *params) {
		Mutex::Autolock autoLock(mLock);

		@@ -155,9 +151,6 @@ status_t VideoEditorSRC::start (MetaData *params) {
		mStarted = true;
		mSource->start();

		//+ debug
		fp = fopen("/sdcard/output.pcm", "wb");

		return OK;
		}

		@@ -176,8 +169,6 @@ status_t VideoEditorSRC::stop() {
		mLeftover = 0;
		mLastReadSize = 0;

		//+ debug
		fclose(fp);
		return OK;
		}

		@@ -371,10 +362,6 @@ status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer) {

		mLastReadSize = actualReadSize;

		//+ debug
		//pBuffer->frameCount = 1024;
		fwrite(pBuffer->raw, 1, pBuffer->frameCount * mChannelCnt * sizeof(int16_t), fp);

		LOGV("inFrameCount %d", pBuffer->frameCount);

		return OK;

+7 −5

Original line number	Diff line number	Diff line
		@@ -483,7 +483,8 @@ M4OSA_ERR VideoEditor3gpReader_open(M4OSA_Context pContext,

		LOGV("VideoEditor3gpReader_open Datasource start %s",
		(char*)pFileDescriptor);
		pC->mDataSource = DataSource::CreateFromURI((char*)pFileDescriptor);
		//pC->mDataSource = DataSource::CreateFromURI((char*)pFileDescriptor);
		pC->mDataSource = new FileSource ((char*)pFileDescriptor);

		if (pC->mDataSource == NULL) {
		LOGV("VideoEditor3gpReader_open Datasource error");
		@@ -593,6 +594,7 @@ M4OSA_ERR VideoEditor3gpReader_close(M4OSA_Context context) {
		pC->mVideoSource->stop();
		pC->mVideoSource.clear();
		}
		pC->mExtractor.clear();
		pC->mDataSource.clear();

		LOGV("VideoEditor3gpReader_close end");