Snap for 6671561 from f4db80421f70f30505e8c3b3ae6c43e28427fa96 to rvc-release (f0e6ab62) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp

+32 −39

Original line number	Diff line number	Diff line
		@@ -399,6 +399,7 @@ void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) {
		mEncoderWriteData = true;
		mEncoderReturnedEncodedData = false;
		mEncoderReturnedNbBytes = 0;
		if (inHeader->nFilledLen) {
		mCurrentInputTimeStamp = inHeader->nTimeStamp;

		const unsigned nbInputFrames = inHeader->nFilledLen / frameSize;
		@@ -422,6 +423,7 @@ void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) {
		mFlacStreamEncoder,
		mInputBufferPcm32,
		nbInputFrames /samples per channel/ );
		}

		inInfo->mOwnedByUs = false;
		inQueue.erase(inQueue.begin());
		@@ -434,32 +436,23 @@ void SoftFlacEncoder::onQueueFilled(OMX_U32 portIndex) {
		OMX_BUFFERHEADERTYPE *outHeader = outInfo->mHeader;

		if (ok) {
		if (mEncoderReturnedEncodedData && (mEncoderReturnedNbBytes != 0)) {
		ALOGV(" dequeueing buffer on output port after writing data");
		outInfo->mOwnedByUs = false;
		outQueue.erase(outQueue.begin());
		outInfo = NULL;
		notifyFillBufferDone(outHeader);
		outHeader = NULL;
		mEncoderReturnedEncodedData = false;
		} else {
		ALOGV(" encoder process_interleaved returned without data to write");
		if (mSawInputEOS) {
		ALOGV("encoded %d, bytes %lld, eos %d", mEncoderReturnedEncodedData,
		(long long )mEncoderReturnedNbBytes, mSawInputEOS);
		if (mSawInputEOS && !mEncoderReturnedEncodedData) {
		ALOGV("finishing encoder");
		mSentOutputEOS = true;
		FLAC__stream_encoder_finish(mFlacStreamEncoder);
		if (mEncoderReturnedEncodedData && (mEncoderReturnedNbBytes != 0)) {
		ALOGV(" dequeueing residual buffer on output port after writing data");
		outHeader->nFlags = OMX_BUFFERFLAG_EOS;
		}
		if (mSawInputEOS \|\| mEncoderReturnedEncodedData) {
		ALOGV(" dequeueing buffer on output port after writing data");
		outInfo->mOwnedByUs = false;
		outQueue.erase(outQueue.begin());
		outInfo = NULL;
		outHeader->nFlags = OMX_BUFFERFLAG_EOS;
		notifyFillBufferDone(outHeader);
		outHeader = NULL;
		mEncoderReturnedEncodedData = false;
		}
		}
		}
		} else {
		ALOGE(" error encountered during encoding");
		mSignalledError = true;