Merge "AudioFlinger: send track metadata to effects unconditionally" into main (805a405a) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+28 −40

Original line number	Diff line number	Diff line
		@@ -3392,11 +3392,6 @@ ThreadBase::MetadataUpdate PlaybackThread::updateMetadata_l()
		return {}; // nothing to do
		}
		StreamOutHalInterface::SourceMetadata metadata;
		static const bool stereo_spatialization_property =
		property_get_bool("ro.audio.stereo_spatialization_enabled", false);
		const bool stereo_spatialization_enabled =
		stereo_spatialization_property && com_android_media_audio_stereo_spatialization();
		if (stereo_spatialization_enabled) {
		std::map<audio_session_t, std::vector<playback_track_metadata_v7_t> >allSessionsMetadata;
		for (const sp<IAfTrack>& track : mActiveTracks) {
		std::vector<playback_track_metadata_v7_t>& sessionMetadata =
		@@ -3427,14 +3422,7 @@ ThreadBase::MetadataUpdate PlaybackThread::updateMetadata_l()
		if (auto chain = getEffectChain_l(AUDIO_SESSION_DEVICE); chain != nullptr) {
		chain->sendMetadata_l(metadata.tracks, {});
		}
		} else {
		auto backInserter = std::back_inserter(metadata.tracks);
		for (const sp<IAfTrack>& track : mActiveTracks) {
		// No track is invalid as this is called after prepareTrack_l in the same
		// critical section
		track->copyMetadataTo(backInserter);
		}
		}

		sendMetadataToBackend_l(metadata);
		MetadataUpdate change;
		change.playbackMetadataUpdate = metadata.tracks;