commit a42d0bd2c509cf7bc8293b66483d5ab486a3ad4e
author Naresh Tanniru <ntanniru@codeaurora.org> Wed Sep 21 15:30:46 2016 +0530
committer Naresh Tanniru <ntanniru@codeaurora.org> Wed Sep 21 16:04:11 2016 +0530
tree 3323d4fb4b2569189c4fe75deba86466a812f0ce
parent 943bb7c0cb263d9f4d7fdb3b2c5ec748328e684a

hal: Fix improper aac encoder config for split a2dp

- Improper format,sampling rates are configured for
  aac encoder

- Update format data type, format flag, sampling
  rate of aac encoder configuration

Change-Id: I6b1d88829f5314edc5d6cd8bdf2bf22b95df4dbc

hal/audio_extn/a2dp.c

diff --git a/hal/audio_extn/a2dp.c b/hal/audio_extn/a2dp.c
index 7293ded..ea1092a 100644
--- a/hal/audio_extn/a2dp.c
+++ b/hal/audio_extn/a2dp.c
@@ -52,8 +52,6 @@
 #define MEDIA_FMT_AAC_AOT_LC                               2
 #define MEDIA_FMT_AAC_AOT_SBR                              5
 #define MEDIA_FMT_AAC_AOT_PS                               29
-#define MEDIA_FMT_AAC_FORMAT_FLAG_ADTS                     0
-#define MEDIA_FMT_AAC_FORMAT_FLAG_RAW                      3
 #define PCM_CHANNEL_L                                      1
 #define PCM_CHANNEL_R                                      2
 #define PCM_CHANNEL_C                                      3
@@ -131,7 +129,7 @@
     uint32_t      bit_rate;
     uint32_t      enc_mode;
     uint16_t      aac_fmt_flag;
-    uint32_t      channel_cfg;
+    uint16_t      channel_cfg;
     uint32_t      sample_rate;
 } ;
 
@@ -462,6 +460,7 @@
     memset(&aac_dsp_cfg, 0x0, sizeof(struct aac_enc_cfg_t));
     aac_dsp_cfg.enc_format = ENC_MEDIA_FMT_AAC;
     aac_dsp_cfg.bit_rate = aac_bt_cfg->bitrate;
+    aac_dsp_cfg.sample_rate = aac_bt_cfg->sampling_rate;
     switch(aac_bt_cfg->enc_mode) {
         case 0:
             aac_dsp_cfg.enc_mode = MEDIA_FMT_AAC_AOT_LC;
@@ -474,10 +473,7 @@
             aac_dsp_cfg.enc_mode = MEDIA_FMT_AAC_AOT_SBR;
             break;
     }
-    if (aac_bt_cfg->format_flag)
-        aac_dsp_cfg.aac_fmt_flag = MEDIA_FMT_AAC_FORMAT_FLAG_RAW;
-    else
-        aac_dsp_cfg.aac_fmt_flag = MEDIA_FMT_AAC_FORMAT_FLAG_ADTS;
+    aac_dsp_cfg.aac_fmt_flag = aac_bt_cfg->format_flag;
     aac_dsp_cfg.channel_cfg = aac_bt_cfg->channels;
     ret = mixer_ctl_set_array(ctl_enc_data, (void *)&aac_dsp_cfg,
                               sizeof(struct aac_enc_cfg_t));