diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:10:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:10:00 +0000 |
| commit | 3a3e87005fdfbfe4564605220a044b8023d0f539 (patch) | |
| tree | 657e4b6b3ca4d8d7030333975203c91a895b30dd /services/audioflinger/Tracks.cpp | |
| parent | 5ecbdf58b0674ac4a8b9d56b49ebeb1033e5bd27 (diff) | |
| parent | 72215491c60fbcdb9a2f0be782e24e39cca249c5 (diff) | |
| download | frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.zip frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.tar.gz frameworks_av-3a3e87005fdfbfe4564605220a044b8023d0f539.tar.bz2 | |
am 72215491: am 1a475921: am 223fd5c9: audio: new routing strategies and stream types
* commit '72215491c60fbcdb9a2f0be782e24e39cca249c5':
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 6ce2d42..d59e68d 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1658,8 +1658,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) { @@ -1874,7 +1875,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)) { |