Merge "CCodec: Guard against null output->buffers" into rvc-dev (19d51164) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -618,13 +618,14 @@ void CCodecBufferChannel::feedInputBufferIfAvailable() {
		}

		void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {
		if (mInputMetEos \|\|
		mOutput.lock()->buffers->hasPending() \|\|
		mPipelineWatcher.lock()->pipelineFull()) {
		if (mInputMetEos \|\| mPipelineWatcher.lock()->pipelineFull()) {
		return;
		} else {
		}
		{
		Mutexed<Output>::Locked output(mOutput);
		if (!output->buffers \|\| output->buffers->numClientBuffers() >= output->numSlots) {
		if (!output->buffers \|\|
		output->buffers->hasPending() \|\|
		output->buffers->numClientBuffers() >= output->numSlots) {
		return;
		}
		}