Commit 3b87a536 authored Aug 26, 2022 by Shrikara B Committed by Malathi Gottam Sep 08, 2022

CCodec: Update watchdog to handle timeouts accurately

Update initiateReleaseIfStuck function to decide timeout just before
calling onError.
This avoids some cases where an event (e.g., configure)
is decided as timed out by this thread immediately after function
entry. But when the thread is waiting for mConfig lock, configure
function actually returns successfully, which moves the MediaCodec
to valid CONFIGURED state. But since the watchdog thread has
already decided that configure function has timed out, it calls
onError callback to MediaCodec. This moves the MediaCodec state
to UNINTIALIZED after the configure function was successful.
This chain of events creates problem when clients like nuplayer
tries to perform some action on MediaCodec after configure was
successful (but MediaCodec is nor in CONFIGURED state, due to
above onError callback).

So, watchdog thread should check for function timeout just before
calling onError callback to avoid such race conditions.

Bug: 245494175

Change-Id: I6a7d250c7475cb40d25775bfc56ff6c13239afb8

parent b22c6b25

media/codec2/sfplugin/CCodec.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -2541,17 +2541,6 @@ status_t CCodec::configureTunneledVideoPlayback(
		}

		void CCodec::initiateReleaseIfStuck() {
		std::string name;
		bool pendingDeadline = false;
		{
		Mutexed<NamedTimePoint>::Locked deadline(mDeadline);
		if (deadline->get() < std::chrono::steady_clock::now()) {
		name = deadline->getName();
		}
		if (deadline->get() != TimePoint::max()) {
		pendingDeadline = true;
		}
		}
		bool tunneled = false;
		bool isMediaTypeKnown = false;
		{
		@@ -2589,6 +2578,17 @@ void CCodec::initiateReleaseIfStuck() {
		tunneled = config->mTunneled;
		isMediaTypeKnown = (kKnownMediaTypes.count(config->mCodingMediaType) != 0);
		}
		std::string name;
		bool pendingDeadline = false;
		{
		Mutexed<NamedTimePoint>::Locked deadline(mDeadline);
		if (deadline->get() < std::chrono::steady_clock::now()) {
		name = deadline->getName();
		}
		if (deadline->get() != TimePoint::max()) {
		pendingDeadline = true;
		}
		}
		if (!tunneled && isMediaTypeKnown && name.empty()) {
		constexpr std::chrono::steady_clock::duration kWorkDurationThreshold = 3s;
		std::chrono::steady_clock::duration elapsed = mChannel->elapsed();