| commit | fb3d5940108f66fceaa316836259efe6196ea44b | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Mon Sep 11 11:53:50 2023 -0700 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Sep 18 18:43:54 2023 +0000 |
| tree | 267236645bb05465f1995f824ab493eb8aca7160 | |
| parent | c1a739c306f2e4346eabf2f55a0cc20ebc655e40 [diff] |
Fix the format used by ThreadBase::toAudioPortConfig Since 'toAudioPortConfig' is used to communicate to the HAL, the emitted port config specification must use the HAL audio format, not the processing format. This is consistent with use of the 'format()' getter in other code, as it also returns the HAL format. Bug: 298175108 Test: atest audiosystem_tests (cherry picked from https://android-review.googlesource.com/q/commit:88d54da6215bb47f5b0ac6b0c548b6a76c9582bf) Merged-In: I4a09a9f312a1415f7dcb7381a8198a9d60467388 Change-Id: I4a09a9f312a1415f7dcb7381a8198a9d60467388
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 202d7c7..8447de6 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp
@@ -1847,7 +1847,7 @@ config->type = AUDIO_PORT_TYPE_MIX; config->ext.mix.handle = mId; config->sample_rate = mSampleRate; - config->format = mFormat; + config->format = mHALFormat; config->channel_mask = mChannelMask; config->config_mask = AUDIO_PORT_CONFIG_SAMPLE_RATE|AUDIO_PORT_CONFIG_CHANNEL_MASK| AUDIO_PORT_CONFIG_FORMAT;