diff options
| author | Andy Hung <hunga@google.com> | 2014-03-13 13:57:33 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-03-13 13:57:33 -0700 |
| commit | 010a1a1a552cdaad362cea8a0333b8906402dbcb (patch) | |
| tree | d2f450bd5cecda7ce63e89d9f36b5877933115ad /services/audioflinger/Threads.h | |
| parent | e2a9c29f35e0c09782558542fc4cf9823779590e (diff) | |
| download | frameworks_av-010a1a1a552cdaad362cea8a0333b8906402dbcb.zip frameworks_av-010a1a1a552cdaad362cea8a0333b8906402dbcb.tar.gz frameworks_av-010a1a1a552cdaad362cea8a0333b8906402dbcb.tar.bz2 | |
Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""
This reverts commit e2a9c29f35e0c09782558542fc4cf9823779590e.
Diffstat (limited to 'services/audioflinger/Threads.h')
| -rw-r--r-- | services/audioflinger/Threads.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 3af4874..59d5c66 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -450,8 +450,11 @@ 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); - // TODO: rename mixBuffer() to sinkBuffer() or try to remove external use. - int16_t *mixBuffer() const { return mSinkBuffer; }; + // 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); }; virtual void detachAuxEffect_l(int effectId); status_t attachAuxEffect(const sp<AudioFlinger::PlaybackThread::Track> track, @@ -482,7 +485,7 @@ protected: // updated by readOutputParameters_l() size_t mNormalFrameCount; // normal mixer and effects - int16_t* mSinkBuffer; // frame size aligned sink buffer + void* mSinkBuffer; // frame size aligned sink buffer // TODO: // Rearrange the buffer info into a struct/class with |