Merge cherrypicks of ['android-review.googlesource.com/3276973'] into 24Q4-release. (fe7a6971) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -2628,8 +2628,6 @@ void CCodecBufferChannel::sendOutputBuffers() {
		switch (action) {
		case OutputBuffers::SKIP:
		return;
		case OutputBuffers::DISCARD:
		break;
		case OutputBuffers::NOTIFY_CLIENT:
		{
		// TRICKY: we want popped buffers reported in order, so sending
		@@ -2656,13 +2654,16 @@ void CCodecBufferChannel::sendOutputBuffers() {
		outBuffer->meta()->setObject("accessUnitInfo", obj);
		}
		}
		mCallback->onOutputBufferAvailable(index, outBuffer);
		[[fallthrough]];
		}
		case OutputBuffers::DISCARD: {
		if (mHasInputSurface && android::media::codec::provider_->input_surface_throttle()) {
		Mutexed<InputSurface>::Locked inputSurface(mInputSurface);
		--inputSurface->numProcessingBuffersBalance;
		ALOGV("[%s] onOutputBufferAvailable: numProcessingBuffersBalance = %lld",
		ALOGV("[%s] onWorkDone: numProcessingBuffersBalance = %lld",
		mName, static_cast<long long>(inputSurface->numProcessingBuffersBalance));
		}
		mCallback->onOutputBufferAvailable(index, outBuffer);
		break;
		}
		case OutputBuffers::REALLOCATE: