Snap for 12199973 from 0ccf481deec96f908e17508fd417860ffaab6cd5 to 24Q4-release (65e7f20c) · Commits · e / os / android_frameworks_av

media/audio/aconfig/audio.aconfig

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,14 @@ flag {
	bug: "345024266"		bug: "345024266"
	}		}

			flag {
			name: "ring_my_car"
			namespace: "media_audio"
			description:
			"Incoming ringtones will not be muted based on ringer mode when connected to a car"
			bug: "319515324"
			}

	flag {		flag {
	name: "ringer_mode_affects_alarm"		name: "ringer_mode_affects_alarm"
	namespace: "media_audio"		namespace: "media_audio"

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -100,11 +100,6 @@ RetCode DownmixContext::disable() {
	return RetCode::SUCCESS;		return RetCode::SUCCESS;
	}		}

	void DownmixContext::reset() {
	disable();
	resetBuffer();
	}

	IEffect::Status DownmixContext::downmixProcess(float* in, float* out, int samples) {		IEffect::Status DownmixContext::downmixProcess(float* in, float* out, int samples) {
	IEffect::Status status = {EX_ILLEGAL_ARGUMENT, 0, 0};		IEffect::Status status = {EX_ILLEGAL_ARGUMENT, 0, 0};

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,8 @@ class DownmixContext final : public EffectContext {
	public:		public:
	DownmixContext(int statusDepth, const Parameter::Common& common);		DownmixContext(int statusDepth, const Parameter::Common& common);
	~DownmixContext();		~DownmixContext();
	RetCode enable();		RetCode enable() override;
	RetCode disable();		RetCode disable() override;
	void reset();

	RetCode setDmType(Downmix::Type type) {		RetCode setDmType(Downmix::Type type) {
	mType = type;		mType = type;

+0 −20

Original line number	Original line	Diff line number	Diff line
	@@ -71,26 +71,6 @@ ndk::ScopedAStatus DownmixImpl::getDescriptor(Descriptor* _aidl_return) {
	return ndk::ScopedAStatus::ok();		return ndk::ScopedAStatus::ok();
	}		}

	ndk::ScopedAStatus DownmixImpl::commandImpl(CommandId command) {
	RETURN_IF(!mContext, EX_NULL_POINTER, "nullContext");
	switch (command) {
	case CommandId::START:
	mContext->enable();
	break;
	case CommandId::STOP:
	mContext->disable();
	break;
	case CommandId::RESET:
	mContext->reset();
	break;
	default:
	LOG(ERROR) << __func__ << " commandId " << toString(command) << " not supported";
	return ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_ARGUMENT,
	"commandIdNotSupported");
	}
	return ndk::ScopedAStatus::ok();
	}

	ndk::ScopedAStatus DownmixImpl::setParameterSpecific(const Parameter::Specific& specific) {		ndk::ScopedAStatus DownmixImpl::setParameterSpecific(const Parameter::Specific& specific) {
	RETURN_IF(Parameter::Specific::downmix != specific.getTag(), EX_ILLEGAL_ARGUMENT,		RETURN_IF(Parameter::Specific::downmix != specific.getTag(), EX_ILLEGAL_ARGUMENT,
	"EffectNotSupported");		"EffectNotSupported");

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ class DownmixImpl final : public EffectImpl {
	DownmixImpl() = default;		DownmixImpl() = default;
	~DownmixImpl() { cleanUp(); }		~DownmixImpl() { cleanUp(); }

	ndk::ScopedAStatus commandImpl(CommandId command) REQUIRES(mImplMutex) override;
	ndk::ScopedAStatus getDescriptor(Descriptor* _aidl_return) override;		ndk::ScopedAStatus getDescriptor(Descriptor* _aidl_return) override;
	ndk::ScopedAStatus setParameterSpecific(const Parameter::Specific& specific)		ndk::ScopedAStatus setParameterSpecific(const Parameter::Specific& specific)
	REQUIRES(mImplMutex) override;		REQUIRES(mImplMutex) override;