diff options
| author | Andy Hung <hunga@google.com> | 2015-06-19 17:34:53 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2015-06-19 17:34:53 -0700 |
| commit | 60c545dfc4160a6d46febb9aa6684f6d300ec74d (patch) | |
| tree | a5a24b638cb8641e971909ba1a741e64bcaf098a /services/audioflinger/FastMixer.cpp | |
| parent | b36bc776545d9758f3bc9a853a5a0fd51280e9fb (diff) | |
| download | frameworks_av-60c545dfc4160a6d46febb9aa6684f6d300ec74d.zip frameworks_av-60c545dfc4160a6d46febb9aa6684f6d300ec74d.tar.gz frameworks_av-60c545dfc4160a6d46febb9aa6684f6d300ec74d.tar.bz2 | |
Fix FastMixer high bit depth Hal support
Bug: 21959591
Change-Id: Ia3351ea5644b36852a1f0dad1314beac97d840e1
Diffstat (limited to 'services/audioflinger/FastMixer.cpp')
| -rw-r--r-- | services/audioflinger/FastMixer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp index f1cf0aa..45c68b5 100644 --- a/services/audioflinger/FastMixer.cpp +++ b/services/audioflinger/FastMixer.cpp @@ -177,6 +177,10 @@ void FastMixer::onStateChange() free(mSinkBuffer); mSinkBuffer = NULL; if (frameCount > 0 && mSampleRate > 0) { + // The mixer produces either 16 bit PCM or float output, select + // float output if the HAL supports higher than 16 bit precision. + mMixerBufferFormat = mFormat.mFormat == AUDIO_FORMAT_PCM_16_BIT ? + AUDIO_FORMAT_PCM_16_BIT : AUDIO_FORMAT_PCM_FLOAT; // FIXME new may block for unbounded time at internal mutex of the heap // implementation; it would be better to have normal mixer allocate for us // to avoid blocking here and to prevent possible priority inversion |