Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed" into klp-dev (5ea5b020) · Commits · e / os / android_frameworks_av

include/media/stagefright/ACodec.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ private:
		kWhatStart = 'star',
		kWhatRequestIDRFrame = 'ridr',
		kWhatSetParameters = 'setP',
		kWhatSubmitOutputMetaDataBufferIfEOS = 'subm',
		};

		enum {
		@@ -212,6 +213,7 @@ private:
		OMX_U32 *nMinUndequeuedBuffers);
		status_t allocateOutputMetaDataBuffers();
		status_t submitOutputMetaDataBuffer();
		void signalSubmitOutputMetaDataBufferIfEOS_workaround();
		status_t allocateOutputBuffersFromNativeWindow();
		status_t cancelBufferToNativeWindow(BufferInfo *info);
		status_t freeOutputBuffersNotOwnedByComponent();

media/libstagefright/ACodec.cpp

+28 −0

Original line number	Diff line number	Diff line
		@@ -452,6 +452,18 @@ void ACodec::signalRequestIDRFrame() {
		(new AMessage(kWhatRequestIDRFrame, id()))->post();
		}

		// * NOTE: THE FOLLOWING WORKAROUND WILL BE REMOVED *
		// Some codecs may return input buffers before having them processed.
		// This causes a halt if we already signaled an EOS on the input
		// port. For now keep submitting an output buffer if there was an
		// EOS on the input port, but not yet on the output port.
		void ACodec::signalSubmitOutputMetaDataBufferIfEOS_workaround() {
		if (mPortEOS[kPortIndexInput] && !mPortEOS[kPortIndexOutput] &&
		mMetaDataBuffersToSubmit > 0) {
		(new AMessage(kWhatSubmitOutputMetaDataBufferIfEOS, id()))->post();
		}
		}

		status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) {
		CHECK(portIndex == kPortIndexInput \|\| portIndex == kPortIndexOutput);

		@@ -4036,6 +4048,9 @@ void ACodec::ExecutingState::submitOutputMetaBuffers() {
		break;
		}
		}

		// * NOTE: THE FOLLOWING WORKAROUND WILL BE REMOVED *
		mCodec->signalSubmitOutputMetaDataBufferIfEOS_workaround();
		}

		void ACodec::ExecutingState::submitRegularOutputBuffers() {
		@@ -4184,6 +4199,19 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) {
		break;
		}

		// * NOTE: THE FOLLOWING WORKAROUND WILL BE REMOVED *
		case kWhatSubmitOutputMetaDataBufferIfEOS:
		{
		if (mCodec->mPortEOS[kPortIndexInput] &&
		!mCodec->mPortEOS[kPortIndexOutput]) {
		status_t err = mCodec->submitOutputMetaDataBuffer();
		if (err == OK) {
		mCodec->signalSubmitOutputMetaDataBufferIfEOS_workaround();
		}
		}
		return true;
		}

		default:
		handled = BaseState::onMessageReceived(msg);
		break;