Merge "Fix race b/w prepareInitialInputBuffers and feedInputBuffersIfAvailable" into udc-dev (9f896f2f) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodec.cpp

+20 −8

Original line number	Diff line number	Diff line
		@@ -1828,6 +1828,7 @@ void CCodec::start() {
		mCallback->onError(err2, ACTION_CODE_FATAL);
		return;
		}

		err2 = mChannel->start(inputFormat, outputFormat, buffersBoundToCodec);
		if (err2 != OK) {
		mCallback->onError(err2, ACTION_CODE_FATAL);
		@@ -2131,6 +2132,25 @@ void CCodec::signalResume() {
		RevertOutputFormatIfNeeded(outputFormat, config->mOutputFormat);
		}

		std::map<size_t, sp<MediaCodecBuffer>> clientInputBuffers;
		status_t err = mChannel->prepareInitialInputBuffers(&clientInputBuffers);
		if (err != OK) {
		if (err == NO_MEMORY) {
		// NO_MEMORY happens here when all the buffers are still
		// with the codec. That is not an error as it is momentarily
		// and the buffers are send to the client as soon as the codec
		// releases them
		ALOGI("Resuming with all input buffers still with codec");
		} else {
		ALOGE("Resume request for Input Buffers failed");
		mCallback->onError(err, ACTION_CODE_FATAL);
		return;
		}
		}

		// channel start should be called after prepareInitialBuffers
		// Calling before can cause a failure during prepare when
		// buffers are sent to the client before preparation from onWorkDone
		(void)mChannel->start(nullptr, nullptr, [&]{
		Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
		const std::unique_ptr<Config> &config = *configLocked;
		@@ -2148,14 +2168,6 @@ void CCodec::signalResume() {
		state->set(RUNNING);
		}

		std::map<size_t, sp<MediaCodecBuffer>> clientInputBuffers;
		status_t err = mChannel->prepareInitialInputBuffers(&clientInputBuffers);
		// FIXME(b/237656746)
		if (err != OK && err != NO_MEMORY) {
		ALOGE("Resume request for Input Buffers failed");
		mCallback->onError(err, ACTION_CODE_FATAL);
		return;
		}
		mChannel->requestInitialInputBuffers(std::move(clientInputBuffers));
		}