diff options
| author | Andy Hung <hunga@google.com> | 2015-07-23 21:21:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-23 21:21:46 +0000 |
| commit | 240577a43ff8d312fa4b464db887916580473396 (patch) | |
| tree | 0320d0bbb500eeb5d72aa11432350c535eac1a9c /services | |
| parent | 70c1f74f3d4c43b67949f3e742195d60f4677462 (diff) | |
| parent | a97630bda8815958587ca31adb2d37090022af25 (diff) | |
| download | frameworks_av-240577a43ff8d312fa4b464db887916580473396.zip frameworks_av-240577a43ff8d312fa4b464db887916580473396.tar.gz frameworks_av-240577a43ff8d312fa4b464db887916580473396.tar.bz2 | |
Merge "Fix record memory buffer allocation for legacy upmix/downmix" into mnc-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index c360051..43dd53c 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -6651,7 +6651,7 @@ status_t AudioFlinger::RecordThread::RecordBufferConverter::updateParameters( if (mResampler != NULL) { mBufFrameSize = max(mSrcChannelCount, FCC_2) * audio_bytes_per_sample(AUDIO_FORMAT_PCM_FLOAT); - } else if ((mIsLegacyUpmix || mIsLegacyDownmix) && mDstFormat != AUDIO_FORMAT_PCM_FLOAT) { + } else if (mIsLegacyUpmix || mIsLegacyDownmix) { // legacy modes always float mBufFrameSize = mDstChannelCount * audio_bytes_per_sample(AUDIO_FORMAT_PCM_FLOAT); } else if (mSrcChannelMask != mDstChannelMask && mDstFormat != mSrcFormat) { mBufFrameSize = mDstChannelCount * audio_bytes_per_sample(mSrcFormat); |