Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2da7e2a6 authored Sep 20, 2023 by Treehugger Robot Committed by Automerger Merge Worker Sep 20, 2023

Merge "Add format change check rule" into main am: 718ccb5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2711853

Change-Id: I0ecc51454d6df690fe69c69f249437a0555586ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d47e457b 718ccb5e

media/codec2/sfplugin/CCodecBufferChannel.cpp

+9 −2

Original line number	Diff line number	Diff line
		@@ -2147,8 +2147,15 @@ bool CCodecBufferChannel::handleWork(

		if (notifyClient && !buffer && !flags) {
		if (mTunneled && drop && outputFormat) {
		if (mOutputFormat != outputFormat) {
		ALOGV("[%s] onWorkDone: Keep tunneled, drop frame with format change (%lld)",
		mName, work->input.ordinal.frameIndex.peekull());
		mOutputFormat = outputFormat;
		} else {
		ALOGV("[%s] onWorkDone: Not reporting output buffer without format change (%lld)",
		mName, work->input.ordinal.frameIndex.peekull());
		notifyClient = false;
		}
		} else {
		ALOGV("[%s] onWorkDone: Not reporting output buffer (%lld)",
		mName, work->input.ordinal.frameIndex.peekull());

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,7 @@ private:
		std::shared_ptr<C2BlockPool> mInputAllocator;
		QueueSync mQueueSync;
		std::vector<std::unique_ptr<C2Param>> mParamsToBeSet;
		sp<AMessage> mOutputFormat;

		struct Input {
		Input();