Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev (877c673c) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -2366,6 +2366,10 @@ void ACodec::waitUntilAllPossibleNativeWindowBuffersAreReturnedToUs() {

		while (countBuffersOwnedByNativeWindow() > (size_t)minUndequeuedBufs
		&& dequeueBufferFromNativeWindow() != NULL) {
		// these buffers will be submitted as regular buffers; account for this
		if (mStoreMetaDataInOutputBuffers && mMetaDataBuffersToSubmit > 0) {
		--mMetaDataBuffersToSubmit;
		}
		}
		}

		@@ -4000,10 +4004,9 @@ void ACodec::ExecutingState::submitRegularOutputBuffers() {
		}

		void ACodec::ExecutingState::submitOutputBuffers() {
		submitRegularOutputBuffers();
		if (mCodec->mStoreMetaDataInOutputBuffers) {
		submitOutputMetaBuffers();
		} else {
		submitRegularOutputBuffers();
		}
		}