Snap for 11794304 from d8878f6b3a3ee8eb168e91a77b62633fd7db543d to 24Q3-release (2384909d) · Commits · e / os / android_frameworks_av

media/codec2/hal/hidl/1.0/vts/functional/component/VtsHalMediaC2V1_0TargetComponentTest.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -263,9 +263,6 @@ TEST_P(Codec2ComponentHidlTest, Timeout) {
		ALOGV("mComponent->reset() timeConsumed=%" PRId64 " us", timeConsumed);
		ASSERT_EQ(err, C2_OK);

		err = mComponent->start();
		ASSERT_EQ(err, C2_OK);

		// Query supported params by the component
		std::vector<std::shared_ptr<C2ParamDescriptor>> params;
		startTime = getNowUs();
		@@ -298,6 +295,9 @@ TEST_P(Codec2ComponentHidlTest, Timeout) {
		timeConsumed);
		}

		err = mComponent->start();
		ASSERT_EQ(err, C2_OK);

		std::list<std::unique_ptr<C2Work>> workList;
		startTime = getNowUs();
		err = mComponent->queue(&workList);

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+14 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <system/audio_effects/effect_visualizer.h>

		#include <utils/Log.h>
		#include <Utils.h>

		#include "EffectConversionHelperAidl.h"
		#include "EffectProxy.h"
		@@ -37,18 +38,20 @@ namespace android {
		namespace effect {

		using ::aidl::android::aidl_utils::statusTFromBinderStatus;
		using ::aidl::android::hardware::audio::common::getChannelCount;
		using ::aidl::android::hardware::audio::effect::CommandId;
		using ::aidl::android::hardware::audio::effect::Descriptor;
		using ::aidl::android::hardware::audio::effect::Flags;
		using ::aidl::android::hardware::audio::effect::IEffect;
		using ::aidl::android::hardware::audio::effect::Parameter;
		using ::aidl::android::hardware::audio::effect::State;
		using ::aidl::android::media::audio::common::AudioChannelLayout;
		using ::aidl::android::media::audio::common::AudioDeviceDescription;
		using ::aidl::android::media::audio::common::AudioMode;
		using ::aidl::android::media::audio::common::AudioSource;
		using ::android::hardware::EventFlag;
		using android::effect::utils::EffectParamReader;
		using android::effect::utils::EffectParamWriter;
		using android::hardware::EventFlag;

		using ::android::status_t;

		@@ -519,5 +522,15 @@ status_t EffectConversionHelperAidl::reopen() {
		return OK;
		}

		size_t EffectConversionHelperAidl::getAudioChannelCount() const {
		return getChannelCount(mCommon.input.base.channelMask,
		~AudioChannelLayout::LAYOUT_HAPTIC_AB /* mask */);
		}

		size_t EffectConversionHelperAidl::getHapticChannelCount() const {
		return getChannelCount(mCommon.input.base.channelMask,
		AudioChannelLayout::LAYOUT_HAPTIC_AB /* mask */);
		}

		} // namespace effect
		} // namespace android

media/libaudiohal/impl/EffectConversionHelperAidl.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,9 @@ class EffectConversionHelperAidl {
		::aidl::android::hardware::audio::effect::Descriptor getDescriptor() const;
		status_t reopen();

		size_t getAudioChannelCount() const;
		size_t getHapticChannelCount() const;

		uint8_t mOutputAccessMode = EFFECT_BUFFER_ACCESS_WRITE;

		protected:

media/libaudiohal/impl/EffectHalAidl.cpp

+32 −5

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/

		#include <cstddef>
		#include <cstring>
		#define LOG_TAG "EffectHalAidl"
		//#define LOG_NDEBUG 0

		@@ -128,6 +129,7 @@ status_t EffectHalAidl::createAidlConversion(
		::aidl::android::hardware::audio::effect::getEffectTypeUuidHapticGenerator()) {
		mConversion = std::make_unique<android::effect::AidlConversionHapticGenerator>(
		effect, sessionId, ioId, desc, mIsProxyEffect);
		mIsHapticGenerator = true;
		} else if (typeUuid ==
		::aidl::android::hardware::audio::effect::getEffectTypeUuidLoudnessEnhancer()) {
		mConversion = std::make_unique<android::effect::AidlConversionLoudnessEnhancer>(
		@@ -200,7 +202,7 @@ status_t EffectHalAidl::process() {
		::android::OK == efGroup->wait(kEventFlagDataMqUpdate, &efState,
		1 /* ns /, true / retry */) &&
		efState & kEventFlagDataMqUpdate) {
		ALOGV("%s %s V%d receive dataMQUpdate eventFlag from HAL", __func__, effectName.c_str(),
		ALOGD("%s %s V%d receive dataMQUpdate eventFlag from HAL", __func__, effectName.c_str(),
		halVersion);

		mConversion->reopen();
		@@ -216,7 +218,7 @@ status_t EffectHalAidl::process() {
		}

		size_t available = inputQ->availableToWrite();
		size_t floatsToWrite = std::min(available, mInBuffer->getSize() / sizeof(float));
		const size_t floatsToWrite = std::min(available, mInBuffer->getSize() / sizeof(float));
		if (floatsToWrite == 0) {
		ALOGE("%s not able to write, floats in buffer %zu, space in FMQ %zu", __func__,
		mInBuffer->getSize() / sizeof(float), available);
		@@ -248,7 +250,7 @@ status_t EffectHalAidl::process() {
		}

		available = outputQ->availableToRead();
		size_t floatsToRead = std::min(available, mOutBuffer->getSize() / sizeof(float));
		const size_t floatsToRead = std::min(available, mOutBuffer->getSize() / sizeof(float));
		if (floatsToRead == 0) {
		ALOGE("%s not able to read, buffer space %zu, floats in FMQ %zu", __func__,
		mOutBuffer->getSize() / sizeof(float), available);
		@@ -257,7 +259,8 @@ status_t EffectHalAidl::process() {

		float *outputRawBuffer = mOutBuffer->audioBuffer()->f32;
		std::vector<float> tempBuffer;
		if (mConversion->mOutputAccessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {
		// keep original data in the output buffer for accumulate mode or HapticGenerator effect
		if (mConversion->mOutputAccessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE \|\| mIsHapticGenerator) {
		tempBuffer.resize(floatsToRead);
		outputRawBuffer = tempBuffer.data();
		}
		@@ -267,7 +270,31 @@ status_t EffectHalAidl::process() {
		mOutBuffer->audioBuffer());
		return INVALID_OPERATION;
		}

		// HapticGenerator needs special handling because the generated haptic samples should append to
		// the end of audio samples, the generated haptic data pass back from HAL in output FMQ at same
		// offset as input buffer, here we skip the audio samples in output FMQ and append haptic
		// samples to the end of input buffer
		if (mIsHapticGenerator) {
		static constexpr float kHalFloatSampleLimit = 2.0f;
		assert(floatsToRead == floatsToWrite);
		const auto audioChNum = mConversion->getAudioChannelCount();
		const auto audioSamples =
		floatsToWrite * audioChNum / (audioChNum + mConversion->getHapticChannelCount());
		// accumulate or copy input to output, haptic samples remains all zero
		if (mConversion->mOutputAccessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {
		accumulate_float(mOutBuffer->audioBuffer()->f32, mInBuffer->audioBuffer()->f32,
		audioSamples);
		} else {
		memcpy_to_float_from_float_with_clamping(mOutBuffer->audioBuffer()->f32,
		mInBuffer->audioBuffer()->f32, audioSamples,
		kHalFloatSampleLimit);
		}
		// append the haptic sample at the end of input audio samples
		memcpy_to_float_from_float_with_clamping(mInBuffer->audioBuffer()->f32 + audioSamples,
		outputRawBuffer + audioSamples,
		floatsToRead - audioSamples, kHalFloatSampleLimit);
		} else if (mConversion->mOutputAccessMode == EFFECT_BUFFER_ACCESS_ACCUMULATE) {
		accumulate_float(mOutBuffer->audioBuffer()->f32, outputRawBuffer, floatsToRead);
		}

media/libaudiohal/impl/EffectHalAidl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ class EffectHalAidl : public EffectHalInterface {
		const int32_t mSessionId;
		const int32_t mIoId;
		const bool mIsProxyEffect;
		bool mIsHapticGenerator = false;

		std::unique_ptr<EffectConversionHelperAidl> mConversion;