diff options
author | Andy Hung <hunga@google.com> | 2015-01-14 19:04:10 -0800 |
---|---|---|
committer | Andy Hung <hunga@google.com> | 2015-01-15 16:57:42 -0800 |
commit | c25b84abdd7ff229d0af663fbf3a37bd9512939d (patch) | |
tree | f6b95e15432dfac6410a1c61bd34e1f8aacdbb3e /services/audioflinger/PlaybackTracks.h | |
parent | abdb990953ffe94a9dc544aea0bed17ef7d5f484 (diff) | |
download | frameworks_av-c25b84abdd7ff229d0af663fbf3a37bd9512939d.zip frameworks_av-c25b84abdd7ff229d0af663fbf3a37bd9512939d.tar.gz frameworks_av-c25b84abdd7ff229d0af663fbf3a37bd9512939d.tar.bz2 |
Allow duplicating thread to use native mixing audio format
Update OutputTrack to take variable formats.
Previously conversion to AUDIO_FORMAT_PCM_16_BIT was required.
Change-Id: I4a96a60ddd8d8dfe651405a0bcd4f98c89bc1ade
Diffstat (limited to 'services/audioflinger/PlaybackTracks.h')
-rw-r--r-- | services/audioflinger/PlaybackTracks.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/PlaybackTracks.h b/services/audioflinger/PlaybackTracks.h index ee48276..902d5e4 100644 --- a/services/audioflinger/PlaybackTracks.h +++ b/services/audioflinger/PlaybackTracks.h @@ -255,7 +255,7 @@ public: class Buffer : public AudioBufferProvider::Buffer { public: - int16_t *mBuffer; + void *mBuffer; }; OutputTrack(PlaybackThread *thread, @@ -271,7 +271,7 @@ public: AudioSystem::SYNC_EVENT_NONE, int triggerSession = 0); virtual void stop(); - bool write(int16_t* data, uint32_t frames); + bool write(void* data, uint32_t frames); bool bufferQueueEmpty() const { return mBufferQueue.size() == 0; } bool isActive() const { return mActive; } const wp<ThreadBase>& thread() const { return mThread; } |