diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-11-21 02:45:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 02:45:58 +0000 |
| commit | c63c09738772133e9b20a7c8576ad116ff855ee2 (patch) | |
| tree | 2ab99e4bc77c0dd3e7b01f5679b43d5a6d808f76 | |
| parent | f108dc85443936ca219567cc3a8556daa4a20fb3 (diff) | |
| parent | d48f1b68b2b824ffcfdbf6aa67ad4696020a8a11 (diff) | |
| download | frameworks_av-c63c09738772133e9b20a7c8576ad116ff855ee2.zip frameworks_av-c63c09738772133e9b20a7c8576ad116ff855ee2.tar.gz frameworks_av-c63c09738772133e9b20a7c8576ad116ff855ee2.tar.bz2 | |
am f50db74f: Merge "Fix format conversion in DuplicatingThread" into lmp-mr1-dev
automerge: d48f1b6
* commit 'd48f1b68b2b824ffcfdbf6aa67ad4696020a8a11':
Fix format conversion in DuplicatingThread
| -rw-r--r-- | services/audioflinger/Threads.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index a75f784..885aded 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -4694,15 +4694,15 @@ void AudioFlinger::DuplicatingThread::threadLoop_sleepTime() ssize_t AudioFlinger::DuplicatingThread::threadLoop_write() { + // We convert the duplicating thread format to AUDIO_FORMAT_PCM_16_BIT + // for delivery downstream as needed. This in-place conversion is safe as + // AUDIO_FORMAT_PCM_16_BIT is smaller than any other supported format + // (AUDIO_FORMAT_PCM_8_BIT is not allowed here). + if (mFormat != AUDIO_FORMAT_PCM_16_BIT) { + memcpy_by_audio_format(mSinkBuffer, AUDIO_FORMAT_PCM_16_BIT, + mSinkBuffer, mFormat, writeFrames * mChannelCount); + } for (size_t i = 0; i < outputTracks.size(); i++) { - // We convert the duplicating thread format to AUDIO_FORMAT_PCM_16_BIT - // for delivery downstream as needed. This in-place conversion is safe as - // AUDIO_FORMAT_PCM_16_BIT is smaller than any other supported format - // (AUDIO_FORMAT_PCM_8_BIT is not allowed here). - if (mFormat != AUDIO_FORMAT_PCM_16_BIT) { - memcpy_by_audio_format(mSinkBuffer, AUDIO_FORMAT_PCM_16_BIT, - mSinkBuffer, mFormat, writeFrames * mChannelCount); - } outputTracks[i]->write(reinterpret_cast<int16_t*>(mSinkBuffer), writeFrames); } mStandby = false; |