Merge "AudioFlinger: Extract MelReporter class" into main (c981ed86) · Commits · e / devices / smdk4412 / android_frameworks_av

services/audioflinger/AudioFlinger.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,7 @@
	// Classes that depend on IAf* interfaces but are not cross-dependent.		// Classes that depend on IAf* interfaces but are not cross-dependent.
	#include "PatchCommandThread.h"		#include "PatchCommandThread.h"
	#include "DeviceEffectManager.h"		#include "DeviceEffectManager.h"
			#include "MelReporter.h"

	namespace android {		namespace android {

	@@ -166,6 +167,7 @@ class AudioFlinger : public AudioFlingerServerAdapter::Delegate
	friend class Client; // removeClient_l();		friend class Client; // removeClient_l();
	friend class DeviceEffectManager;		friend class DeviceEffectManager;
	friend class DeviceEffectManagerCallback;		friend class DeviceEffectManagerCallback;
			friend class MelReporter;
	friend class PatchPanel;		friend class PatchPanel;
	// TODO(b/291012167) replace the Thread friends with an interface.		// TODO(b/291012167) replace the Thread friends with an interface.
	friend class DirectOutputThread;		friend class DirectOutputThread;
	@@ -588,8 +590,6 @@ public:
	using TeePatches = std::vector<TeePatch>;		using TeePatches = std::vector<TeePatch>;
	private:		private:

	#include "MelReporter.h"

	// Find io handle by session id.		// Find io handle by session id.
	// Preference is given to an io handle with a matching effect chain to session id.		// Preference is given to an io handle with a matching effect chain to session id.
	// If none found, AUDIO_IO_HANDLE_NONE is returned.		// If none found, AUDIO_IO_HANDLE_NONE is returned.

services/audioflinger/MelReporter.cpp

+16 −16

services/audioflinger/MelReporter.h

+8 −8

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

	#ifndef INCLUDING_FROM_AUDIOFLINGER_H		#pragma once
	#error This header file should only be included from AudioFlinger.h
	#endif

	#include <mutex>		#include <mutex>
	#include <sounddose/SoundDoseManager.h>		#include <sounddose/SoundDoseManager.h>
	#include <unordered_map>		#include <unordered_map>

			namespace android {

	constexpr static int kMaxTimestampDeltaInSec = 120;		constexpr static int kMaxTimestampDeltaInSec = 120;

	/**		/**
	@@ -112,9 +112,9 @@ private:
	* Locking order AudioFlinger::mLock -> PatchCommandThread::mLock -> MelReporter::mLock.		* Locking order AudioFlinger::mLock -> PatchCommandThread::mLock -> MelReporter::mLock.
	*/		*/
	std::mutex mLock;		std::mutex mLock;
	std::unordered_map<audio_patch_handle_t, ActiveMelPatch>		std::unordered_map<audio_patch_handle_t, ActiveMelPatch> mActiveMelPatches GUARDED_BY(mLock);
	mActiveMelPatches GUARDED_BY(AudioFlinger::MelReporter::mLock);		std::unordered_map<audio_port_handle_t, int> mActiveDevices GUARDED_BY(mLock);
	std::unordered_map<audio_port_handle_t, int>		bool mUseHalSoundDoseInterface GUARDED_BY(mLock) = false;
	mActiveDevices GUARDED_BY(AudioFlinger::MelReporter::mLock);
	bool mUseHalSoundDoseInterface GUARDED_BY(AudioFlinger::MelReporter::mLock) = false;
	};		};

			} // namespace android

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@
	*/		*/

	// #define LOG_NDEBUG 0		// #define LOG_NDEBUG 0
	#define LOG_TAG "AudioFlinger::MelReporter"		#define LOG_TAG "MelReporter"

	#include "AudioFlinger.h"		#include "AudioFlinger.h"

	@@ -28,7 +28,7 @@ using aidl::android::hardware::audio::core::sounddose::ISoundDose;

	namespace android {		namespace android {

	bool AudioFlinger::MelReporter::activateHalSoundDoseComputation(const std::string& module,		bool MelReporter::activateHalSoundDoseComputation(const std::string& module,
	const sp<DeviceHalInterface>& device) {		const sp<DeviceHalInterface>& device) {
	if (mSoundDoseManager->forceUseFrameworkMel()) {		if (mSoundDoseManager->forceUseFrameworkMel()) {
	ALOGD("%s: Forcing use of internal MEL computation.", __func__);		ALOGD("%s: Forcing use of internal MEL computation.", __func__);
	@@ -63,7 +63,7 @@ bool AudioFlinger::MelReporter::activateHalSoundDoseComputation(const std::strin
	return true;		return true;
	}		}

	void AudioFlinger::MelReporter::activateInternalSoundDoseComputation() {		void MelReporter::activateInternalSoundDoseComputation() {
	{		{
	std::lock_guard _l(mLock);		std::lock_guard _l(mLock);
	if (!mUseHalSoundDoseInterface) {		if (!mUseHalSoundDoseInterface) {
	@@ -76,11 +76,11 @@ void AudioFlinger::MelReporter::activateInternalSoundDoseComputation() {
	mSoundDoseManager->setHalSoundDoseInterface(nullptr);		mSoundDoseManager->setHalSoundDoseInterface(nullptr);
	}		}

	void AudioFlinger::MelReporter::onFirstRef() {		void MelReporter::onFirstRef() {
	mAudioFlinger.mPatchCommandThread->addListener(this);		mAudioFlinger.mPatchCommandThread->addListener(this);
	}		}

	bool AudioFlinger::MelReporter::shouldComputeMelForDeviceType(audio_devices_t device) {		bool MelReporter::shouldComputeMelForDeviceType(audio_devices_t device) {
	if (!mSoundDoseManager->isCsdEnabled()) {		if (!mSoundDoseManager->isCsdEnabled()) {
	ALOGV("%s csd is disabled", __func__);		ALOGV("%s csd is disabled", __func__);
	return false;		return false;
	@@ -104,7 +104,7 @@ bool AudioFlinger::MelReporter::shouldComputeMelForDeviceType(audio_devices_t de
	}		}
	}		}