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

Commit 42fa1a15 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 am: 2da7e2a6...

Merge "Add format change check rule" into main am: 718ccb5e am: 2da7e2a6 am: b4cef76c am: d8f137b8

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

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

parents 6e479c5b d8f137b8

media/codec2/sfplugin/CCodecBufferChannel.cpp

+9 −2

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

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

media/codec2/sfplugin/CCodecBufferChannel.h

+1 −0

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

	struct Input {		struct Input {
	Input();		Input();