Snap for 10622798 from 6791d1293a1abfb8a4afd88061514b7c4d725b5e to udc-qpr1-release (fda679a8) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+20 −14

Original line number	Diff line number	Diff line
		@@ -10614,14 +10614,24 @@ AudioFlinger::MmapPlaybackThread::MmapPlaybackThread(
		AudioHwDevice hwDev, AudioStreamOut output, bool systemReady)
		: MmapThread(audioFlinger, id, hwDev, output->stream, systemReady, true /* isOut */),
		mStreamType(AUDIO_STREAM_MUSIC),
		mStreamVolume(1.0),
		mStreamMute(false),
		mOutput(output)
		{
		snprintf(mThreadName, kThreadNameLength, "AudioMmapOut_%X", id);
		mChannelCount = audio_channel_count_from_out_mask(mChannelMask);
		mMasterVolume = audioFlinger->masterVolume_l();
		mMasterMute = audioFlinger->masterMute_l();

		for (int i = AUDIO_STREAM_MIN; i < AUDIO_STREAM_FOR_POLICY_CNT; ++i) {
		const audio_stream_type_t stream{static_cast<audio_stream_type_t>(i)};
		mStreamTypes[stream].volume = 0.0f;
		mStreamTypes[stream].mute = mAudioFlinger->streamMute_l(stream);
		}
		// Audio patch and call assistant volume are always max
		mStreamTypes[AUDIO_STREAM_PATCH].volume = 1.0f;
		mStreamTypes[AUDIO_STREAM_PATCH].mute = false;
		mStreamTypes[AUDIO_STREAM_CALL_ASSISTANT].volume = 1.0f;
		mStreamTypes[AUDIO_STREAM_CALL_ASSISTANT].mute = false;

		if (mAudioHwDev) {
		if (mAudioHwDev->canSetMasterVolume()) {
		mMasterVolume = 1.0;
		@@ -10678,8 +10688,8 @@ void AudioFlinger::MmapPlaybackThread::setMasterMute(bool muted)
		void AudioFlinger::MmapPlaybackThread::setStreamVolume(audio_stream_type_t stream, float value)
		{
		Mutex::Autolock _l(mLock);
		mStreamTypes[stream].volume = value;
		if (stream == mStreamType) {
		mStreamVolume = value;
		broadcast_l();
		}
		}
		@@ -10687,17 +10697,14 @@ void AudioFlinger::MmapPlaybackThread::setStreamVolume(audio_stream_type_t strea
		float AudioFlinger::MmapPlaybackThread::streamVolume(audio_stream_type_t stream) const
		{
		Mutex::Autolock _l(mLock);
		if (stream == mStreamType) {
		return mStreamVolume;
		}
		return 0.0f;
		return mStreamTypes[stream].volume;
		}

		void AudioFlinger::MmapPlaybackThread::setStreamMute(audio_stream_type_t stream, bool muted)
		{
		Mutex::Autolock _l(mLock);
		mStreamTypes[stream].mute = muted;
		if (stream == mStreamType) {
		mStreamMute= muted;
		broadcast_l();
		}
		}
		@@ -10737,14 +10744,13 @@ NO_THREAD_SAFETY_ANALYSIS // access of track->processMuteEvent_l
		{
		float volume;

		if (mMasterMute \|\| mStreamMute) {
		if (mMasterMute \|\| streamMuted_l()) {
		volume = 0;
		} else {
		volume = mMasterVolume * mStreamVolume;
		volume = mMasterVolume * streamVolume_l();
		}

		if (volume != mHalVolFloat) {

		// Convert volumes from float to 8.24
		uint32_t vol = (uint32_t)(volume * (1 << 24));

		@@ -10778,8 +10784,8 @@ NO_THREAD_SAFETY_ANALYSIS // access of track->processMuteEvent_l
		track->setMetadataHasChanged();
		track->processMuteEvent_l(mAudioFlinger->getOrCreateAudioManager(),
		/muteState=/{mMasterMute,
		mStreamVolume == 0.f,
		mStreamMute,
		streamVolume_l() == 0.f,
		streamMuted_l(),
		// TODO(b/241533526): adjust logic to include mute from AppOps
		false /muteFromPlaybackRestricted/,
		false /muteFromClientVolume/,
		@@ -10892,7 +10898,7 @@ void AudioFlinger::MmapPlaybackThread::dumpInternals_l(int fd, const Vector<Stri
		MmapThread::dumpInternals_l(fd, args);

		dprintf(fd, " Stream type: %d Stream volume: %f HAL volume: %f Stream mute %d\n",
		mStreamType, mStreamVolume, mHalVolFloat, mStreamMute);
		mStreamType, streamVolume_l(), mHalVolFloat, streamMuted_l());
		dprintf(fd, " Master volume: %f Master mute %d\n", mMasterVolume, mMasterMute);
		}

services/audioflinger/Threads.h

+7 −2

Original line number	Diff line number	Diff line
		@@ -2313,12 +2313,17 @@ public:

		protected:
		void dumpInternals_l(int fd, const Vector<String16>& args) override;
		float streamVolume_l() const {
		return mStreamTypes[mStreamType].volume;
		}
		bool streamMuted_l() const {
		return mStreamTypes[mStreamType].mute;
		}

		stream_type_t mStreamTypes[AUDIO_STREAM_CNT];
		audio_stream_type_t mStreamType;
		float mMasterVolume;
		float mStreamVolume;
		bool mMasterMute;
		bool mStreamMute;
		AudioStreamOut* mOutput;

		mediautils::atomic_sp<audio_utils::MelProcessor> mMelProcessor;

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+11 −7

Original line number	Diff line number	Diff line
		@@ -5912,22 +5912,26 @@ bool AudioPolicyManager::canBeSpatializedInt(const audio_attributes_t *attr,
		}
		}

		sp<IOProfile> profile =
		getSpatializerOutputProfile(config, devices);
		if (profile == nullptr) {
		return false;
		}

		// The caller can have the audio config criteria ignored by either passing a null ptr or
		// the AUDIO_CONFIG_INITIALIZER value.
		// If an audio config is specified, current policy is to only allow spatialization for
		// some positional channel masks.
		// some positional channel masks and PCM format

		if (config != nullptr && *config != AUDIO_CONFIG_INITIALIZER) {
		if (!audio_is_channel_mask_spatialized(config->channel_mask)) {
		return false;
		}
		if (!audio_is_linear_pcm(config->format)) {
		return false;
		}
		}

		sp<IOProfile> profile =
		getSpatializerOutputProfile(config, devices);
		if (profile == nullptr) {
		return false;
		}

		return true;
		}

services/camera/libcameraservice/device3/Camera3Device.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -4010,8 +4010,11 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
		sp<Camera3Device> parent = mParent.promote();
		if (parent != nullptr) {
		const String8& streamCameraId = outputStream->getPhysicalCameraId();
		// Consider the case where clients are sending a single logical camera request
		// to physical output/outputs
		bool singleRequest = captureRequest->mSettingsList.size() == 1;
		for (const auto& settings : captureRequest->mSettingsList) {
		if ((streamCameraId.isEmpty() &&
		if (((streamCameraId.isEmpty() \|\| singleRequest) &&
		parent->getId() == settings.cameraId.c_str()) \|\|
		streamCameraId == settings.cameraId.c_str()) {
		outputStream->fireBufferRequestForFrameNumber(