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

Commit 15219fb1 authored Aug 19, 2024 by Arun Johnson Committed by Arian Sep 18, 2024

Changing interface creation for Large audio frame

Instead of using the reflector helper from the store, we now
use a separate reflector and add the reflector to ComponentStore.

Bug: 352550763

Test: atest android.mediav2.cts.CodecDecoderMultiAccessUnitTest
Test: atest android.mediav2.cts.CodecEncoderMultiAccessUnitTest
Test: atest android.mediav2.cts.CodecDecoderBlockModelMultiAccessUnitTest
Test: atest android.media.drmframework.cts.CodecDecoderMultiAccessUnitDrmTest

Change-Id: Idf67d9ce0ca9c9c29a5a025d9d4aecebc10f1d87

parent 8931fa8f

media/codec2/hal/aidl/ComponentStore.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -232,9 +232,11 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
	// param reflectors. Currently filters work on video domain only,		// param reflectors. Currently filters work on video domain only,
	// and the MultiAccessUnitHelper is only enabled on audio domain;		// and the MultiAccessUnitHelper is only enabled on audio domain;
	// thus we pass the component's param reflector, which is mParamReflectors[0].		// thus we pass the component's param reflector, which is mParamReflectors[0].
			std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
	multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(		multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
	c2interface,		c2interface,
	std::static_pointer_cast<C2ReflectorHelper>(mParamReflectors[0]));		multiAccessReflector);
			mParamReflectors.push_back(multiAccessReflector);
	}		}
	}		}
	}		}

media/codec2/hal/hidl/1.0/utils/ComponentStore.cpp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -223,9 +223,12 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
	}		}
	}		}
	if (!isComponentSupportsLargeAudioFrame) {		if (!isComponentSupportsLargeAudioFrame) {
			std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
	multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(		multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
	c2interface,		c2interface,
	std::static_pointer_cast<C2ReflectorHelper>(mParamReflectors[0]));		multiAccessReflector);
			mParamReflectors.push_back(multiAccessReflector);

	}		}
	}		}
	}		}

media/codec2/hal/hidl/1.1/utils/ComponentStore.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -224,9 +224,11 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
	}		}

	if (!isComponentSupportsLargeAudioFrame) {		if (!isComponentSupportsLargeAudioFrame) {
			std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
	multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(		multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
	c2interface,		c2interface,
	std::static_pointer_cast<C2ReflectorHelper>(mParamReflectors[0]));		multiAccessReflector);
			mParamReflectors.push_back(multiAccessReflector);
	}		}
	}		}
	}		}

media/codec2/hal/hidl/1.2/utils/ComponentStore.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -223,9 +223,11 @@ std::shared_ptr<MultiAccessUnitInterface> ComponentStore::tryCreateMultiAccessUn
	}		}
	}		}
	if (!isComponentSupportsLargeAudioFrame) {		if (!isComponentSupportsLargeAudioFrame) {
			std::shared_ptr<C2ReflectorHelper> multiAccessReflector(new C2ReflectorHelper());
	multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(		multiAccessUnitIntf = std::make_shared<MultiAccessUnitInterface>(
	c2interface,		c2interface,
	std::static_pointer_cast<C2ReflectorHelper>(mParamReflectors[0]));		multiAccessReflector);
			mParamReflectors.push_back(multiAccessReflector);
	}		}
	}		}
	}		}