diff options
author | Glenn Kasten <gkasten@google.com> | 2014-09-03 17:55:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 17:55:48 +0000 |
commit | 648c1ecee3f79ff9d754dd982be59484de08d752 (patch) | |
tree | 790ebb44db33c2218fab8aa2ee740a746d4cccc0 /services/audioflinger/Tracks.cpp | |
parent | c08f60b17967cf99bb03105081fb9064b5f34545 (diff) | |
parent | 955d8f906e920fe8da66e7943a7f2bfa98422e19 (diff) | |
download | frameworks_av-648c1ecee3f79ff9d754dd982be59484de08d752.zip frameworks_av-648c1ecee3f79ff9d754dd982be59484de08d752.tar.gz frameworks_av-648c1ecee3f79ff9d754dd982be59484de08d752.tar.bz2 |
am 955d8f90: am 23c8cf95: Merge "Restore the ability to build tee sink for debugging" into lmp-dev
* commit '955d8f906e920fe8da66e7943a7f2bfa98422e19':
Restore the ability to build tee sink for debugging
Diffstat (limited to 'services/audioflinger/Tracks.cpp')
-rw-r--r-- | services/audioflinger/Tracks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 6482f68..c718b0c 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -182,7 +182,7 @@ AudioFlinger::ThreadBase::TrackBase::TrackBase( #ifdef TEE_SINK if (mTeeSinkTrackEnabled) { - NBAIO_Format pipeFormat = Format_from_SR_C(mSampleRate, mChannelCount); + NBAIO_Format pipeFormat = Format_from_SR_C(mSampleRate, mChannelCount, mFormat); if (Format_isValid(pipeFormat)) { Pipe *pipe = new Pipe(mTeeSinkTrackFrames, pipeFormat); size_t numCounterOffers = 0; |