commit 3fdf4fc6ff5294b1bf31bccfe1b27b951763bfe2
author Steve Kondik <steve@cyngn.com> Wed Dec 10 21:15:43 2014 -0800
committer Steve Kondik <steve@cyngn.com> Tue Oct 13 09:03:35 2015 -1000
tree 797207bf7ebd30bdda773b9d681f664c55e2cd53
parent 36679910b42a495a7b60349964979a9579c8dda7

hal: Be specific about supported offload formats

 * We need to look at the subformats here since certain combinations
   are not valid.
 * Fixes AAC offload with Tidal.

Change-Id: Ice41aeb7e011a4421e52b02a6e53b6bc36f0b9c6

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 5d5e359..215ceec 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -262,9 +262,10 @@
 
 static bool is_supported_format(audio_format_t format)
 {
-    switch (format & AUDIO_FORMAT_MAIN_MASK) {
+    switch (format) {
     case AUDIO_FORMAT_MP3:
-    case AUDIO_FORMAT_PCM_OFFLOAD:
+    case AUDIO_FORMAT_PCM_16_BIT_OFFLOAD:
+    case AUDIO_FORMAT_PCM_24_BIT_OFFLOAD:
 #ifdef FLAC_OFFLOAD_ENABLED
     case AUDIO_FORMAT_FLAC:
 #endif
@@ -280,6 +281,8 @@
     case AUDIO_FORMAT_AAC_HE_V2:
         return true;
 
+    default:
+        return false;
     }
     return false;
 }
@@ -2648,7 +2651,7 @@
         }
         if (!is_supported_format(config->offload_info.format) &&
                 !audio_extn_is_dolby_format(config->offload_info.format)) {
-            ALOGE("%s: Unsupported audio format", __func__);
+            ALOGE("%s: Unsupported offload audio format %x", __func__, config->offload_info.format);
             ret = -EINVAL;
             goto error_open;
         }
@@ -2703,7 +2706,7 @@
         out->compr_config.codec->ch_out = out->compr_config.codec->ch_in;
         out->bit_width = config->offload_info.bit_width;
 
-        if (config->offload_info.format == AUDIO_FORMAT_AAC)
+        if ((config->offload_info.format & AUDIO_FORMAT_MAIN_MASK) == AUDIO_FORMAT_AAC)
             out->compr_config.codec->format = SND_AUDIOSTREAMFORMAT_RAW;
         if (config->offload_info.format == AUDIO_FORMAT_PCM_16_BIT_OFFLOAD)
             out->compr_config.codec->format = SNDRV_PCM_FORMAT_S16_LE;