diff options
author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:01:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:01:49 +0000 |
commit | 72215491c60fbcdb9a2f0be782e24e39cca249c5 (patch) | |
tree | ac366bd0aad25d9575b19f77a75f23518a8810e8 /services/audioflinger/Tracks.cpp | |
parent | fd2711ca8c9108d25f18b48b924afd925f41344a (diff) | |
parent | 1a475921c0577a4650d1bbe40a85b732d1766939 (diff) | |
download | frameworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.zip frameworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.tar.gz frameworks_av-72215491c60fbcdb9a2f0be782e24e39cca249c5.tar.bz2 |
am 1a475921: am 223fd5c9: audio: new routing strategies and stream types
* commit '1a475921c0577a4650d1bbe40a85b732d1766939':
audio: new routing strategies and stream types
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r-- | services/audioflinger/Tracks.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 037c73b..aa708ec 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1657,8 +1657,9 @@ AudioFlinger::PlaybackThread::OutputTrack::OutputTrack( audio_channel_mask_t channelMask, size_t frameCount, int uid) - : Track(playbackThread, NULL, AUDIO_STREAM_CNT, sampleRate, format, channelMask, frameCount, - NULL, 0, 0, uid, IAudioFlinger::TRACK_DEFAULT, TYPE_OUTPUT), + : Track(playbackThread, NULL, AUDIO_STREAM_PATCH, + sampleRate, format, channelMask, frameCount, + NULL, 0, 0, uid, IAudioFlinger::TRACK_DEFAULT, TYPE_OUTPUT), mActive(false), mSourceThread(sourceThread), mClientProxy(NULL) { @@ -1873,7 +1874,8 @@ AudioFlinger::PlaybackThread::PatchTrack::PatchTrack(PlaybackThread *playbackThr size_t frameCount, void *buffer, IAudioFlinger::track_flags_t flags) - : Track(playbackThread, NULL, AUDIO_STREAM_CNT, sampleRate, format, channelMask, frameCount, + : Track(playbackThread, NULL, AUDIO_STREAM_PATCH, + sampleRate, format, channelMask, frameCount, buffer, 0, 0, getuid(), flags, TYPE_PATCH), mProxy(new ClientProxy(mCblk, mBuffer, frameCount, mFrameSize, true, true)) { |