Merge "Codec2Cient: Do not hold lock during IGBP operations" into main (644db222) · Commits · e / os / android_frameworks_av

media/codec2/hal/client/output.cpp

+10 −7

Original line number	Diff line number	Diff line
		@@ -141,11 +141,14 @@ status_t attachToBufferQueue(const C2ConstGraphicBlock& block,
		"status = " << INVALID_OPERATION << ".";
		return INVALID_OPERATION;
		}
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		if (result == OK) {
		syncVar->notifyDequeuedLocked();
		}
		syncVar->unlock();
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		if (result != OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		syncVar->unlock();
		}
		} else {
		result = igbp->attachBuffer(bqSlot, graphicBuffer);
		}
		@@ -435,13 +438,13 @@ status_t OutputBufferQueue::outputBuffer(

		auto syncVar = syncMem ? syncMem->mem() : nullptr;
		if(syncVar) {
		syncVar->lock();
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		if (status == OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		}
		syncVar->unlock();
		}
		} else {
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		@@ -490,13 +493,13 @@ status_t OutputBufferQueue::outputBuffer(
		auto syncVar = syncMem ? syncMem->mem() : nullptr;
		status_t status = OK;
		if (syncVar) {
		syncVar->lock();
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);
		if (status == OK) {
		syncVar->lock();
		syncVar->notifyQueuedLocked();
		}
		syncVar->unlock();
		}
		} else {
		status = outputIgbp->queueBuffer(static_cast<int>(bqSlot),
		input, output);