Merge "AudioFlinger: Update PatchCommandThread class includes" into udc-dev-plus-aosp (657bb39c) · Commits · e / os / android_frameworks_av

services/audioflinger/IAfPatchPanel.h

+11 −6

Original line number	Diff line number	Diff line
		@@ -16,15 +16,20 @@

		#pragma once

		// The following includes are required because we have class definitions below
		// for EndPoint and Patch, which precludes using a forward declaration only.
		#include "IAfThread.h" // IAfThreadBase IAfMmapThread IAfPlaybackThread IAfRecordThread
		#include "IAfTrack.h" // IAfPatchRecord IAfPatchTrack

		#include <datapath/AudioHwDevice.h>
		#include <media/DeviceDescriptorBase.h>
		#include <utils/Log.h> // ALOG used in this file
		#include <utils/RefBase.h> // avoid transitive dependency
		#include <utils/Thread.h>

		namespace android {

		class IAfMmapThread;
		class IAfPatchPanel;
		class IAfPatchRecord;
		class IAfPatchTrack;
		class IAfPlaybackThread;
		class IAfRecordThread;
		class IAfThreadBase;
		class PatchCommandThread;

		class SoftwarePatch {

+30 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,25 @@

		#pragma once

		#include "IAfTrack.h"
		#include <android/media/IAudioTrackCallback.h>
		#include <android/media/IEffectClient.h>
		#include <audiomanager/IAudioManager.h>
		#include <audio_utils/MelProcessor.h>
		#include <binder/MemoryDealer.h>
		#include <datapath/AudioStreamIn.h>
		#include <datapath/AudioStreamOut.h>
		#include <datapath/VolumeInterface.h>
		#include <fastpath/FastMixerDumpState.h>
		#include <media/DeviceDescriptorBase.h>
		#include <media/MmapStreamInterface.h>
		#include <media/audiohal/StreamHalInterface.h>
		#include <media/nblog/NBLog.h>
		#include <timing/SyncEvent.h>
		#include <utils/Mutex.h>
		#include <utils/RefBase.h>
		#include <vibrator/ExternalVibration.h>

		#include <optional>

		namespace android {

		@@ -26,6 +44,17 @@ class IAfMmapCaptureThread;
		class IAfMmapPlaybackThread;
		class IAfPlaybackThread;
		class IAfRecordThread;

		class IAfEffectChain;
		class IAfEffectHandle;
		class IAfEffectModule;
		class IAfPatchPanel;
		class IAfPatchRecord;
		class IAfPatchTrack;
		class IAfRecordTrack;
		class IAfTrack;
		class IAfTrackBase;
		class Client;
		class MelReporter;

		// Note this is exposed through IAfThreadBase::afThreadCallback()

+19 −0

Original line number	Diff line number	Diff line
		@@ -16,8 +16,27 @@

		#pragma once

		#include <android/media/BnAudioRecord.h>
		#include <android/media/BnAudioTrack.h>
		#include <audiomanager/IAudioManager.h>
		#include <binder/IMemory.h>
		#include <fastpath/FastMixerDumpState.h>
		#include <media/AudioSystem.h>
		#include <media/VolumeShaper.h>
		#include <private/media/AudioTrackShared.h>
		#include <timing/SyncEvent.h>
		#include <timing/SynchronizedRecordState.h>
		#include <utils/RefBase.h>
		#include <vibrator/ExternalVibration.h>

		#include <vector>

		namespace android {

		class Client;
		class ResamplerBufferProvider;
		struct Source;

		class IAfDuplicatingThread;
		class IAfPatchRecord;
		class IAfPatchTrack;

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@
		#define LOG_TAG "AudioFlinger::PatchCommandThread"
		//#define LOG_NDEBUG 0

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

		#include <utils/Log.h>

		namespace android {

+8 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,14 @@

		#pragma once

		#include "IAfPatchPanel.h"

		#include <utils/RefBase.h> // avoid transitive dependency
		#include <utils/Thread.h> // avoid transitive dependency

		#include <deque>
		#include <mutex> // avoid transitive dependency

		namespace android {

		class Command;