Merge "AudioFlinger: Update Tracks class includes" into udc-dev-plus-aosp (590dd5e0) · Commits · e / os / android_frameworks_av

services/audioflinger/MmapTracks.h

+4 −0

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

	#pragma once		#pragma once

			#include "TrackBase.h"

			#include <android/content/AttributionSourceState.h>

	namespace android {		namespace android {

	// playback track		// playback track

services/audioflinger/PlaybackTracks.h

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,12 @@
	*/		*/

	#pragma once		#pragma once
	#include <math.h>
	#include <sys/types.h>		#include "TrackBase.h"

			#include <android/os/BnExternalVibrationController.h>
			#include <audio_utils/LinearMap.h>
			#include <binder/AppOpsManager.h>

	namespace android {		namespace android {

services/audioflinger/RecordTracks.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,10 @@

	#pragma once		#pragma once

			#include "TrackBase.h"

	#include <android/content/AttributionSourceState.h>		#include <android/content/AttributionSourceState.h>
			#include <datapath/AudioStreamIn.h> // struct Source

	namespace android {		namespace android {

services/audioflinger/TrackBase.h

+12 −0

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

	#pragma once		#pragma once

			#include "Configuration.h" // TEE_SINK
			#include "IAfTrack.h"

			#include <afutils/NBAIO_Tee.h>
			#include <android-base/macros.h> // DISALLOW_COPY_AND_ASSIGN
			#include <datapath/TrackMetrics.h>
			#include <mediautils/BatteryNotifier.h>

			#include <atomic> // avoid transitive dependency
			#include <list> // avoid transitive dependency
			#include <optional> // avoid transitive dependency

	namespace android {		namespace android {

	// base for record and playback		// base for record and playback

services/audioflinger/Tracks.cpp

+17 −16

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


	#define LOG_TAG "AudioFlinger"		#define LOG_TAG "AudioFlinger"
	//#define LOG_NDEBUG 0		//#define LOG_NDEBUG 0
	#define ATRACE_TAG ATRACE_TAG_AUDIO		#define ATRACE_TAG ATRACE_TAG_AUDIO

	#include "Configuration.h"		#include "MmapTracks.h"
	#include <linux/futex.h>
	#include <math.h>
	#include <sys/syscall.h>
	#include <utils/Log.h>
	#include <utils/Trace.h>

	#include <private/media/AudioTrackShared.h>

	#include "AudioFlinger.h"
	#include "TrackBase.h"
	#include "PlaybackTracks.h"		#include "PlaybackTracks.h"
	#include "RecordTracks.h"		#include "RecordTracks.h"
	#include "MmapTracks.h"

	#include <media/nbaio/Pipe.h>		#include "Client.h"
	#include <media/nbaio/PipeReader.h>		#include "IAfEffect.h"
			#include "IAfThread.h"
			#include "ResamplerBufferProvider.h"

			#include <audio_utils/minifloat.h>
	#include <media/AudioValidator.h>		#include <media/AudioValidator.h>
	#include <media/RecordBufferConverter.h>		#include <media/RecordBufferConverter.h>
			#include <media/nbaio/Pipe.h>
			#include <media/nbaio/PipeReader.h>
	#include <mediautils/ServiceUtilities.h>		#include <mediautils/ServiceUtilities.h>
	#include <audio_utils/minifloat.h>		#include <mediautils/SharedMemoryAllocator.h>
			#include <private/media/AudioTrackShared.h>
			#include <utils/Log.h>
			#include <utils/Trace.h>

			#include <linux/futex.h>
			#include <math.h>
			#include <sys/syscall.h>

	// ----------------------------------------------------------------------------		// ----------------------------------------------------------------------------