diff options
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index fe42afa..46788c4 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -33,28 +33,13 @@ namespace android { #define WAIT_PERIOD_MS 10 #define RESTORE_TIMEOUT_MS 5000 // Maximum waiting time for a track to be restored -#define CBLK_UNDERRUN_MSK 0x0001 -#define CBLK_UNDERRUN_ON 0x0001 // underrun (out) or overrrun (in) indication -#define CBLK_UNDERRUN_OFF 0x0000 // no underrun -#define CBLK_DIRECTION_MSK 0x0002 -#define CBLK_DIRECTION_OUT 0x0002 // this cblk is for an AudioTrack -#define CBLK_DIRECTION_IN 0x0000 // this cblk is for an AudioRecord -#define CBLK_FORCEREADY_MSK 0x0004 -#define CBLK_FORCEREADY_ON 0x0004 // track is considered ready immediately by AudioFlinger -#define CBLK_FORCEREADY_OFF 0x0000 // track is ready when buffer full -#define CBLK_INVALID_MSK 0x0008 -#define CBLK_INVALID_ON 0x0008 // track buffer is invalidated by AudioFlinger: -#define CBLK_INVALID_OFF 0x0000 // must be re-created -#define CBLK_DISABLED_MSK 0x0010 -#define CBLK_DISABLED_ON 0x0010 // track disabled by AudioFlinger due to underrun: -#define CBLK_DISABLED_OFF 0x0000 // must be re-started -#define CBLK_RESTORING_MSK 0x0020 -#define CBLK_RESTORING_ON 0x0020 // track is being restored after invalidation -#define CBLK_RESTORING_OFF 0x0000 // by AudioFlinger -#define CBLK_RESTORED_MSK 0x0040 -#define CBLK_RESTORED_ON 0x0040 // track has been restored after invalidation -#define CBLK_RESTORED_OFF 0x0040 // by AudioFlinger -#define CBLK_FAST 0x0080 // AudioFlinger successfully created a fast track +#define CBLK_UNDERRUN 0x01 // set: underrun (out) or overrrun (in), clear: no underrun or overrun +#define CBLK_FORCEREADY 0x02 // set: track is considered ready immediately by AudioFlinger, + // clear: track is ready when buffer full +#define CBLK_INVALID 0x04 // track buffer invalidated by AudioFlinger, need to re-create +#define CBLK_DISABLED 0x08 // track disabled by AudioFlinger due to underrun, need to re-start +#define CBLK_RESTORING 0x10 // track is being restored after invalidation by AudioFlinger +#define CBLK_RESTORED 0x20 // track has been restored after invalidation by AudioFlinger // Important: do not add any virtual methods, including ~ struct audio_track_cblk_t @@ -116,13 +101,22 @@ public: // Since the control block is always located in shared memory, this constructor // is only used for placement new(). It is never used for regular new() or stack. audio_track_cblk_t(); - uint32_t stepUser(uint32_t frameCount); // called by client only, where - // client includes regular AudioTrack and AudioFlinger::PlaybackThread::OutputTrack - bool stepServer(uint32_t frameCount); // called by server only + + // called by client only, where client includes regular + // AudioTrack and AudioFlinger::PlaybackThread::OutputTrack + uint32_t stepUserIn(uint32_t frameCount) { return stepUser(frameCount, false); } + uint32_t stepUserOut(uint32_t frameCount) { return stepUser(frameCount, true); } + + bool stepServer(uint32_t frameCount, bool isOut); + void* buffer(uint32_t offset) const; - uint32_t framesAvailable(); - uint32_t framesAvailable_l(); - uint32_t framesReady(); // called by server only + uint32_t framesAvailableIn() { return framesAvailable(false); } + uint32_t framesAvailableOut() { return framesAvailable(true); } + uint32_t framesAvailableIn_l() { return framesAvailable_l(false); } + uint32_t framesAvailableOut_l() { return framesAvailable_l(true); } + uint32_t framesReadyIn() { return framesReady(false); } + uint32_t framesReadyOut() { return framesReady(true); } + bool tryLock(); // No barriers on the following operations, so the ordering of loads/stores @@ -148,6 +142,12 @@ public: return mVolumeLR; } +private: + // isOut == true means AudioTrack, isOut == false means AudioRecord + uint32_t stepUser(uint32_t frameCount, bool isOut); + uint32_t framesAvailable(bool isOut); + uint32_t framesAvailable_l(bool isOut); + uint32_t framesReady(bool isOut); }; |