commit bf05e947e90e7a1e9a038b8ec609401331bdf2e6
author Phil Burk <philburk@google.com> Thu Dec 21 00:03:09 2023 +0000
committer Phil Burk <philburk@google.com> Thu Feb 08 00:42:59 2024 +0000
tree 5512cf14e339d507511487c13b28cf926a9cb664
parent 016cf79d0086780a602d6b43839c47477e82d3aa

aaudio: do not allow SRC mismatch if flag off

The purpose of this CL is to skip several attempts at
opening a stream if we know it will fail due to a sample rate mismatch.
This will speed up the open and reduce log spam.

Bug: 219533889
Bug: 318893452
Test: OboeTester, TEST OUTPUT, SRate:16000
Change-Id: I5cba48bda5f60f861d08642be8d77d55ecbef860

services/oboeservice/AAudioServiceEndpointMMAP.cpp

diff --git a/services/oboeservice/AAudioServiceEndpointMMAP.cpp b/services/oboeservice/AAudioServiceEndpointMMAP.cpp
index 6b48075..5b4fca9 100644
--- a/services/oboeservice/AAudioServiceEndpointMMAP.cpp
+++ b/services/oboeservice/AAudioServiceEndpointMMAP.cpp
@@ -37,6 +37,8 @@
 #include "AAudioServiceEndpointPlay.h"
 #include "AAudioServiceEndpointMMAP.h"
 
+#include <com_android_media_aaudio.h>
+
 #define AAUDIO_BUFFER_CAPACITY_MIN    (4 * 512)
 #define AAUDIO_SAMPLE_RATE_DEFAULT    48000
 
@@ -148,9 +150,15 @@
 
         // Try other formats if the config from APM is the same as our current config.
         // Some HALs may report its format support incorrectly.
-        if ((previousConfig.format == config.format) &&
-                (previousConfig.sample_rate == config.sample_rate)) {
-            config.format = getNextFormatToTry(config.format);
+        if (previousConfig.format == config.format) {
+            if (previousConfig.sample_rate == config.sample_rate) {
+                config.format = getNextFormatToTry(config.format);
+            } else if (!com::android::media::aaudio::sample_rate_conversion()) {
+                ALOGI("%s() - AAudio SRC feature not enabled, different rates! %d != %d",
+                      __func__, previousConfig.sample_rate, config.sample_rate);
+                result = AAUDIO_ERROR_INVALID_RATE;
+                break;
+            }
         }
 
         ALOGD("%s() %#x %d failed, perhaps due to format or sample rate. Try again with %#x %d",