Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cef6f36 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioFlinger: Update Tracks class includes" into udc-dev-plus-aosp am: 590dd5e0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24501993



Change-Id: I59409ed054355041176af534a1a0c8a4e6be1dc0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4150cdbf 590dd5e0

services/audioflinger/MmapTracks.h

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 


#pragma once



#include "TrackBase.h"



#include <android/content/AttributionSourceState.h>



namespace android {



// playback track

services/audioflinger/PlaybackTracks.h

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



#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 {

services/audioflinger/RecordTracks.h

+3 −0
Original line number Diff line number Diff line
@@ -17,7 +17,10 @@ 


#pragma once



#include "TrackBase.h"



#include <android/content/AttributionSourceState.h>

#include <datapath/AudioStreamIn.h> // struct Source



namespace android {

services/audioflinger/TrackBase.h

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ 


#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 {



// base for record and playback

services/audioflinger/Tracks.cpp

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

*/





#define LOG_TAG "AudioFlinger"

//#define LOG_NDEBUG 0

#define ATRACE_TAG ATRACE_TAG_AUDIO



#include "Configuration.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 "MmapTracks.h"

#include "PlaybackTracks.h"

#include "RecordTracks.h"

#include "MmapTracks.h"



#include <media/nbaio/Pipe.h>

#include <media/nbaio/PipeReader.h>

#include "Client.h"

#include "IAfEffect.h"

#include "IAfThread.h"

#include "ResamplerBufferProvider.h"



#include <audio_utils/minifloat.h>

#include <media/AudioValidator.h>

#include <media/RecordBufferConverter.h>

#include <media/nbaio/Pipe.h>

#include <media/nbaio/PipeReader.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>



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