Snap for 9939584 from 0fdbbe7ed9f02f06aab3f82fa45f086d0278d6c3 to udc-release (993cb8c6) · Commits · e / os / android_frameworks_av

media/libaudiofoundation/AudioProfile.cpp

+18 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,24 @@ bool AudioProfileVector::hasDynamicRateFor(audio_format_t format) const
		return false;
		}

		const SampleRateSet AudioProfileVector::getSampleRatesFor(audio_format_t format) const {
		for (const auto& profile : *this) {
		if (profile->getFormat() == format) {
		return profile->getSampleRates();
		}
		}
		return {};
		}

		const ChannelMaskSet AudioProfileVector::getChannelMasksFor(audio_format_t format) const {
		for (const auto& profile : *this) {
		if (profile->getFormat() == format) {
		return profile->getChannels();
		}
		}
		return {};
		}

		bool AudioProfileVector::contains(const sp<AudioProfile>& profile, bool ignoreDynamicFlags) const
		{
		for (const auto& audioProfile : *this) {

media/libaudiofoundation/include/media/AudioProfile.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,9 @@ public:
		bool hasDynamicProfile() const;
		bool hasDynamicRateFor(audio_format_t format) const;

		const SampleRateSet getSampleRatesFor(audio_format_t format) const;
		const ChannelMaskSet getChannelMasksFor(audio_format_t format) const;

		bool contains(const sp<AudioProfile>& profile, bool ignoreDynamicFlags = false) const;

		virtual void dump(std::string *dst, int spaces) const;

media/libaudiohal/impl/DeviceHalAidl.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -937,10 +937,13 @@ status_t DeviceHalAidl::dump(int fd, const Vector<String16>& args) {
		return mModule->dump(fd, Args(args).args(), args.size());
		}

		int32_t DeviceHalAidl::supportsBluetoothVariableLatency(bool* supports __unused) {
		int32_t DeviceHalAidl::supportsBluetoothVariableLatency(bool* supports) {
		TIME_CHECK();
		ALOGE("%s not implemented yet", __func__);
		return INVALID_OPERATION;
		if (!mModule) return NO_INIT;
		if (supports == nullptr) {
		return BAD_VALUE;
		}
		return statusTFromBinderStatus(mModule->supportsVariableLatency(supports));
		}

		status_t DeviceHalAidl::getSoundDoseInterface(const std::string& module,

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+28 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <cstddef>
		#include <cstdint>
		#include <cstring>
		#include <optional>
		@@ -44,6 +45,7 @@ using ::aidl::android::hardware::audio::effect::State;
		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;

		@@ -127,6 +129,8 @@ status_t EffectConversionHelperAidl::handleSetParameter(uint32_t cmdSize, const
		status_t EffectConversionHelperAidl::handleGetParameter(uint32_t cmdSize, const void* pCmdData,
		uint32_t* replySize, void* pReplyData) {
		if (cmdSize < sizeof(effect_param_t) \|\| !pCmdData \|\| !replySize \|\| !pReplyData) {
		ALOGE("%s illegal cmdSize %u pCmdData %p replySize %p replyData %p", __func__, cmdSize,
		pCmdData, replySize, pReplyData);
		return BAD_VALUE;
		}

		@@ -183,8 +187,9 @@ status_t EffectConversionHelperAidl::handleSetConfig(uint32_t cmdSize, const voi
		}

		if (state == State::INIT) {
		ALOGI("%s at state %s, opening effect", __func__,
		android::internal::ToString(state).c_str());
		ALOGI("%s at state %s, opening effect with input %s output %s", __func__,
		android::internal::ToString(state).c_str(), common.input.toString().c_str(),
		common.output.toString().c_str());
		IEffect::OpenEffectReturn openReturn;
		RETURN_STATUS_IF_ERROR(
		statusTFromBinderStatus(mEffect->open(common, std::nullopt, &openReturn)));
		@@ -200,6 +205,11 @@ status_t EffectConversionHelperAidl::handleSetConfig(uint32_t cmdSize, const voi
		mInputQ = std::make_shared<DataMQ>(openReturn.inputDataMQ);
		mOutputQ = std::make_shared<DataMQ>(openReturn.outputDataMQ);
		}

		if (status_t status = updateEventFlags(); status != OK) {
		mEffect->close();
		return status;
		}
		mCommon = common;
		} else if (mCommon != common) {
		ALOGI("%s at state %s, setParameter", __func__, android::internal::ToString(state).c_str());
		@@ -343,6 +353,7 @@ status_t EffectConversionHelperAidl::handleSetOffload(uint32_t cmdSize, const vo
		mStatusQ = std::make_shared<StatusMQ>(ret->statusMQ);
		mInputQ = std::make_shared<DataMQ>(ret->inputDataMQ);
		mOutputQ = std::make_shared<DataMQ>(ret->outputDataMQ);
		RETURN_STATUS_IF_ERROR(updateEventFlags());
		}
		return static_cast<int32_t>(pReplyData) = OK;
		}
		@@ -387,5 +398,20 @@ status_t EffectConversionHelperAidl::handleVisualizerMeasure(uint32_t cmdSize __
		return visualizerMeasure(replySize, pReplyData);
		}

		status_t EffectConversionHelperAidl::updateEventFlags() {
		status_t status = BAD_VALUE;
		EventFlag* efGroup = nullptr;
		if (mStatusQ->isValid()) {
		status = EventFlag::createEventFlag(mStatusQ->getEventFlagWord(), &efGroup);
		if (status != OK \|\| !efGroup) {
		ALOGE("%s: create EventFlagGroup failed, ret %d, egGroup %p", __func__, status,
		efGroup);
		status = (status == OK) ? BAD_VALUE : status;
		}
		}
		mEfGroup.reset(efGroup, EventFlagDeleter());
		return status;
		}

		} // namespace effect
		} // namespace android

media/libaudiohal/impl/EffectConversionHelperAidl.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ class EffectConversionHelperAidl {
		std::shared_ptr<StatusMQ> getStatusMQ() { return mStatusQ; }
		std::shared_ptr<DataMQ> getInputMQ() { return mInputQ; }
		std::shared_ptr<DataMQ> getOutputMQ() { return mOutputQ; }
		std::shared_ptr<android::hardware::EventFlag> getEventFlagGroup() { return mEfGroup; }

		protected:
		const int32_t mSessionId;
		@@ -85,6 +86,17 @@ class EffectConversionHelperAidl {
		std::shared_ptr<StatusMQ> mStatusQ = nullptr;
		std::shared_ptr<DataMQ> mInputQ = nullptr, mOutputQ = nullptr;


		struct EventFlagDeleter {
		void operator()(::android::hardware::EventFlag* flag) const {
		if (flag) {
		::android::hardware::EventFlag::deleteEventFlag(&flag);
		}
		}
		};
		std::shared_ptr<android::hardware::EventFlag> mEfGroup = nullptr;
		status_t updateEventFlags();

		status_t handleInit(uint32_t cmdSize, const void* pCmdData, uint32_t* replySize,
		void* pReplyData);
		status_t handleSetConfig(uint32_t cmdSize, const void* pCmdData, uint32_t* replySize,
		@@ -121,6 +133,7 @@ class EffectConversionHelperAidl {
		virtual status_t visualizerMeasure(uint32_t* replySize __unused, void* pReplyData __unused) {
		return BAD_VALUE;
		}

		};

		} // namespace effect