Merge "AudioPolicyMix: fix loopback+render mix match rules" (5feac6b6) · Commits · e / os / android_frameworks_av

media/libaudioclient/AudioPolicy.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ status_t AudioMix::readFromParcel(Parcel *parcel)
		mDeviceType = (audio_devices_t) parcel->readInt32();
		mDeviceAddress = parcel->readString8();
		mCbFlags = (uint32_t)parcel->readInt32();
		mAllowPrivilegedPlaybackCapture = parcel->readBool();
		mAllowPrivilegedMediaPlaybackCapture = parcel->readBool();
		mVoiceCommunicationCaptureAllowed = parcel->readBool();
		size_t size = (size_t)parcel->readInt32();
		if (size > MAX_CRITERIA_PER_MIX) {
		@@ -110,7 +110,7 @@ status_t AudioMix::writeToParcel(Parcel *parcel) const
		parcel->writeInt32(mDeviceType);
		parcel->writeString8(mDeviceAddress);
		parcel->writeInt32(mCbFlags);
		parcel->writeBool(mAllowPrivilegedPlaybackCapture);
		parcel->writeBool(mAllowPrivilegedMediaPlaybackCapture);
		parcel->writeBool(mVoiceCommunicationCaptureAllowed);
		size_t size = mCriteria.size();
		if (size > MAX_CRITERIA_PER_MIX) {

media/libaudioclient/include/media/AudioPolicy.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ public:
		String8 mDeviceAddress;
		uint32_t mCbFlags; // flags indicating which callbacks to use, see kCbFlag*
		/** Ignore the AUDIO_FLAG_NO_MEDIA_PROJECTION */
		bool mAllowPrivilegedPlaybackCapture = false;
		bool mAllowPrivilegedMediaPlaybackCapture = false;
		/** Indicates if the caller can capture voice communication output */
		bool mVoiceCommunicationCaptureAllowed = false;
		};

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

+12 −11

Original line number	Diff line number	Diff line
		@@ -208,22 +208,23 @@ AudioPolicyMixCollection::MixMatchStatus AudioPolicyMixCollection::mixMatch(
		// Loopback render mixes are created from a public API and thus restricted
		// to non sensible audio that have not opted out.
		if (is_mix_loopback_render(mix->mRouteFlags)) {
		auto hasFlag = [](auto flags, auto flag) { return (flags & flag) == flag; };
		if (hasFlag(attributes.flags, AUDIO_FLAG_NO_SYSTEM_CAPTURE)) {
		if (!(attributes.usage == AUDIO_USAGE_UNKNOWN \|\|
		attributes.usage == AUDIO_USAGE_MEDIA \|\|
		attributes.usage == AUDIO_USAGE_GAME \|\|
		attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION)) {
		return MixMatchStatus::NO_MATCH;
		}
		if (!mix->mAllowPrivilegedPlaybackCapture &&
		hasFlag(attributes.flags, AUDIO_FLAG_NO_MEDIA_PROJECTION)) {
		auto hasFlag = [](auto flags, auto flag) { return (flags & flag) == flag; };
		if (hasFlag(attributes.flags, AUDIO_FLAG_NO_SYSTEM_CAPTURE)) {
		return MixMatchStatus::NO_MATCH;
		}
		if (attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION &&
		!mix->mVoiceCommunicationCaptureAllowed) {

		if (attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION) {
		if (!mix->mVoiceCommunicationCaptureAllowed) {
		return MixMatchStatus::NO_MATCH;
		}
		if (!(attributes.usage == AUDIO_USAGE_UNKNOWN \|\|
		attributes.usage == AUDIO_USAGE_MEDIA \|\|
		attributes.usage == AUDIO_USAGE_GAME \|\|
		attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION)) {
		} else if (!mix->mAllowPrivilegedMediaPlaybackCapture &&
		hasFlag(attributes.flags, AUDIO_FLAG_NO_MEDIA_PROJECTION)) {
		return MixMatchStatus::NO_MATCH;
		}
		}

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1241,7 +1241,7 @@ status_t AudioPolicyService::registerPolicyMixes(const Vector<AudioMix>& mixes,
		return mix.mVoiceCommunicationCaptureAllowed; });

		bool needCaptureMediaOutput = std::any_of(mixes.begin(), mixes.end(), [](auto& mix) {
		return mix.mAllowPrivilegedPlaybackCapture; });
		return mix.mAllowPrivilegedMediaPlaybackCapture; });

		const uid_t callingUid = IPCThreadState::self()->getCallingUid();
		const pid_t callingPid = IPCThreadState::self()->getCallingPid();