commit 591a98a961f1ff450a55a1ec3bcd4258a642a720
author Kuirong Wang <kuirongw@codeaurora.org> Mon Jun 27 12:41:41 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jul 13 15:41:54 2016 -0700
tree b6061b2d298910f7662f82895e1c86123801a502
parent 87372d4ab234d7e792d6131fa6e41a94d04332eb

hal: fix the parsing issue for USB continuous sample rate

Update to fix the parsing issue for USB headset with continuous
sample rate profile.

Change-Id: I2102ac072dcc7330b075f556e7e24c96584cef16
CRs-Fixed: 1019158

hal/audio_extn/usb.c

diff --git a/hal/audio_extn/usb.c b/hal/audio_extn/usb.c
index da80422..9e19eba 100644
--- a/hal/audio_extn/usb.c
+++ b/hal/audio_extn/usb.c
@@ -255,30 +255,30 @@
      * Support both the bit_widths
      */
     ALOGV("%s: rates_str %s", __func__, rates_str);
+    next_sr_string = strtok_r(rates_str, "Rates: ", &temp_ptr);
+    if (next_sr_string == NULL) {
+        ALOGE("%s: could not find min rates string", __func__);
+        return -EINVAL;
+    }
     if (strstr(rates_str, "continuous") != NULL) {
-        next_sr_string = strtok_r(rates_str, " ,", &temp_ptr);
-        if (next_sr_string == NULL) {
-            ALOGE("%s: could not find min rates string", __func__);
-            return -EINVAL;
-        }
-        min_sr = atoi(next_sr_string);
+        min_sr = (uint32_t)atoi(next_sr_string);
         next_sr_string = strtok_r(NULL, " ,.-", &temp_ptr);
         if (next_sr_string == NULL) {
             ALOGE("%s: could not find max rates string", __func__);
             return -EINVAL;
         }
-        max_sr = atoi(next_sr_string);
+        max_sr = (uint32_t)atoi(next_sr_string);
 
-        for (i = 0; i < MAX_SAMPLE_RATE_SIZE; i++)
+        for (i = 0; i < MAX_SAMPLE_RATE_SIZE; i++) {
             if (supported_sample_rates[i] >= min_sr &&
-                supported_sample_rates[i] <= max_sr)
+                supported_sample_rates[i] <= max_sr) {
                 config->rates[sr_size++] = supported_sample_rates[i];
-    } else {
-        next_sr_string = strtok_r(rates_str, " ,", &temp_ptr);
-        if (next_sr_string == NULL) {
-            ALOGE("%s: get_numof_rates: could not find rates string", __func__);
-            return -EINVAL;
+                ALOGI_IF(usb_audio_debug_enable,
+                    "%s: continuous sample rate supported_sample_rates[%d] %d",
+                    __func__, i, supported_sample_rates[i]);
+            }
         }
+    } else {
         do {
             sr = (uint32_t)atoi(next_sr_string);
             for (i = 0; i < MAX_SAMPLE_RATE_SIZE; i++) {