commit 5659ed5327fbd6a412ecd65235eea68a5a59fd39
author Andy Hung <hunga@google.com> Mon Apr 30 10:31:26 2018 -0700
committer Andy Hung <hunga@google.com> Mon Apr 30 10:56:52 2018 -0700
tree cdbee9dc70ddf66800ec413587af91e182e98d81
parent e5a37268101a2c9d8019938f4e5ac9eec2e52fca

AudioPolicyManager: Ensure direct output matches exact format

Otherwise AudioFlinger will fail on createTrack.

Test: No regression on Play Music Offload playback
Bug: 77507038
Change-Id: I0702e3047e385889861288072d4f5c6e99e8924d

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 3736129..264e709 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -915,7 +915,7 @@
                 // reuse direct output if currently open by the same client
                 // and configured with same parameters
                 if ((config->sample_rate == desc->mSamplingRate) &&
-                    audio_formats_match(config->format, desc->mFormat) &&
+                    (config->format == desc->mFormat) &&
                     (config->channel_mask == desc->mChannelMask) &&
                     (session == desc->mDirectClientSession)) {
                     desc->mDirectOpenCount++;
@@ -942,8 +942,7 @@
         // only accept an output with the requested parameters
         if (status != NO_ERROR ||
             (config->sample_rate != 0 && config->sample_rate != outputDesc->mSamplingRate) ||
-            (config->format != AUDIO_FORMAT_DEFAULT &&
-                    !audio_formats_match(config->format, outputDesc->mFormat)) ||
+            (config->format != AUDIO_FORMAT_DEFAULT && config->format != outputDesc->mFormat) ||
             (config->channel_mask != 0 && config->channel_mask != outputDesc->mChannelMask)) {
             ALOGV("getOutputForDevice() failed opening direct output: output %d sample rate %d %d,"
                     "format %d %d, channel mask %04x %04x", output, config->sample_rate,
@@ -1032,7 +1031,7 @@
             // if a valid format is specified, skip output if not compatible
             if (format != AUDIO_FORMAT_INVALID) {
                 if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
-                    if (!audio_formats_match(format, outputDesc->mFormat)) {
+                    if (format != outputDesc->mFormat) {
                         continue;
                     }
                 } else if (!audio_is_linear_pcm(format)) {