diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-13 10:44:14 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-03-13 10:46:49 -0700 |
| commit | e2a9c29f35e0c09782558542fc4cf9823779590e (patch) | |
| tree | 31a860f1236fa1060cd66e375bbab8e9718ed365 /services/audioflinger/Threads.h | |
| parent | fca092d953e04c7169242200f0ddb914a9f54ea4 (diff) | |
| download | frameworks_av-e2a9c29f35e0c09782558542fc4cf9823779590e.zip frameworks_av-e2a9c29f35e0c09782558542fc4cf9823779590e.tar.gz frameworks_av-e2a9c29f35e0c09782558542fc4cf9823779590e.tar.bz2 | |
Revert "Convert AudioFlinger mSinkBuffer to flexible format"
This reverts commit e7e676fd2866fa4898712c4effa9e624e969c182.
Bug: 13450717.
Change-Id: Ib80b0d14428fecce33c62003a1fcf83f71cee03b
Diffstat (limited to 'services/audioflinger/Threads.h')
| -rw-r--r-- | services/audioflinger/Threads.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 59d5c66..3af4874 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -450,11 +450,8 @@ public: virtual String8 getParameters(const String8& keys); virtual void audioConfigChanged_l(int event, int param = 0); status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames); - // FIXME rename mixBuffer() to sinkBuffer() and remove int16_t* dependency. - // Consider also removing and passing an explicit mMainBuffer initialization - // parameter to AF::PlaybackThread::Track::Track(). - int16_t *mixBuffer() const { - return reinterpret_cast<int16_t *>(mSinkBuffer); }; + // TODO: rename mixBuffer() to sinkBuffer() or try to remove external use. + int16_t *mixBuffer() const { return mSinkBuffer; }; virtual void detachAuxEffect_l(int effectId); status_t attachAuxEffect(const sp<AudioFlinger::PlaybackThread::Track> track, @@ -485,7 +482,7 @@ protected: // updated by readOutputParameters_l() size_t mNormalFrameCount; // normal mixer and effects - void* mSinkBuffer; // frame size aligned sink buffer + int16_t* mSinkBuffer; // frame size aligned sink buffer // TODO: // Rearrange the buffer info into a struct/class with |