diff options
| author | Andy Hung <hunga@google.com> | 2014-08-04 21:28:47 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-11-07 10:14:22 -0800 |
| commit | 0f451e92f09e089e588f303f729425a54fcd804b (patch) | |
| tree | 8072a98cf33396b00b0a13664732c2f0e9fd4689 /services/audioflinger/AudioMixer.h | |
| parent | 49699b56df293b5b6c5440a6488d27e611cfc769 (diff) | |
| download | frameworks_av-0f451e92f09e089e588f303f729425a54fcd804b.zip frameworks_av-0f451e92f09e089e588f303f729425a54fcd804b.tar.gz frameworks_av-0f451e92f09e089e588f303f729425a54fcd804b.tar.bz2 | |
Move AudioMixer buffer provider preparation into track
Bug: 17363939
Change-Id: I1f0f597b008f7369df87ba369fabaa93dec08ea1
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 3b972bb..6ed6c1b 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -236,6 +236,12 @@ private: void adjustVolumeRamp(bool aux, bool useFloat = false); size_t getUnreleasedFrames() const { return resampler != NULL ? resampler->getUnreleasedFrames() : 0; }; + + status_t prepareForDownmix(); + void unprepareForDownmix(); + status_t prepareForReformat(); + void unprepareForReformat(); + void reconfigureBufferProviders(); }; typedef void (*process_hook_t)(state_t* state, int64_t pts); @@ -382,14 +388,6 @@ private: bool setChannelMasks(int name, audio_channel_mask_t trackChannelMask, audio_channel_mask_t mixerChannelMask); - // TODO: remove unused trackName/trackNum from functions below. - static status_t initTrackDownmix(track_t* pTrack, int trackName); - static status_t prepareTrackForDownmix(track_t* pTrack, int trackNum); - static void unprepareTrackForDownmix(track_t* pTrack, int trackName); - static status_t prepareTrackForReformat(track_t* pTrack, int trackNum); - static void unprepareTrackForReformat(track_t* pTrack, int trackName); - static void reconfigureBufferProviders(track_t* pTrack); - static void track__genericResample(track_t* t, int32_t* out, size_t numFrames, int32_t* temp, int32_t* aux); static void track__nop(track_t* t, int32_t* out, size_t numFrames, int32_t* temp, int32_t* aux); |