commit 3421e5c9a83c799b473268728d9b00e8c4b9deec
author Linux Build Service Account <lnxbuild@localhost> Thu Oct 27 09:21:25 2016 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 27 09:21:25 2016 -0700
tree 591dd60cf887e036bcc798c3e3647bead6c9f7b6
parent 3afbeb863015fa44b12e677de2b3692d0c076428
parent 7f25be32cbca198e3da350302f8dfcb83ff1f4a7

Merge "hal: Ensure that 32bit/384kHz is only configured for Tavil codec."

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index fa67342..71efe9f 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -4697,10 +4697,31 @@
                  ALOGD("%s:becf: afe: true napb active set rate to 44.1 khz",
                        __func__);
             }
-        } else if ((OUTPUT_SAMPLING_RATE_44100 == sample_rate) &&
-                   (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1)) {
-                 sample_rate = CODEC_BACKEND_DEFAULT_SAMPLE_RATE;
-                 ALOGD("%s:becf: afe: napb not active - set (48k) default rate",
+        } else if (na_mode != NATIVE_AUDIO_MODE_MULTIPLE_44_1) {
+            /*
+             * Map native sampling rates to upper limit range
+             * if multiple of native sampling rates are not supported.
+             * This check also indicates that this is not tavil codec
+             * And 32bit/384kHz is only supported on tavil
+             * Hence reset 32b/384kHz to 24b/192kHz.
+             */
+            switch (sample_rate) {
+                case 44100:
+                    sample_rate = 48000;
+                    break;
+                case 88200:
+                    sample_rate = 96000;
+                    break;
+                case 176400:
+                case 352800:
+                case 384000:
+                    sample_rate = 192000;
+                    break;
+            }
+            if (bit_width > 24)
+                bit_width = 24;
+
+            ALOGD("%s:becf: afe: napb not active - set non fractional rate",
                        __func__);
         }
     } else if ((usecase->devices & AUDIO_DEVICE_OUT_SPEAKER) ||
@@ -4751,23 +4772,6 @@
             channels_updated = true;
     }
 
-    /*
-     * Map native sampling rates to upper limit range
-     * if multiple of native sampling rates are not supported.
-     */
-    if (NATIVE_AUDIO_MODE_MULTIPLE_44_1 != na_mode) {
-        switch (sample_rate) {
-            case 88200:
-                sample_rate = 96000;
-                break;
-            case 176400:
-                sample_rate = 192000;
-                break;
-            case 352800:
-                sample_rate = 192000;
-                break;
-        }
-    }
 
     ALOGI("%s:becf: afe: Codec selected backend: %d updated bit width: %d and sample rate: %d",
           __func__, backend_idx , bit_width, sample_rate);