commit ae3530f8dd9f700ed83b92edaf26d3c794b9d80f
author Mingming Yin <mingming@codeaurora.org> Thu Jul 03 16:50:18 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 11 10:07:02 2014 -0700
tree 3149f7fe42ca2f3be3b1608bded1cbdeb0694fc9
parent 3b402c4b852e77688fc1137a04e42c3fa75b09ca

hal: update Dolby EAC3 audio format enum

- Update Dolby EAC3 audio format enum to
  AUDIO_FORMAT_E_AC3.
- This new format is introduced in AOSP code

Change-Id: Id1f524b430b086b881c74f6cb91c9823439a251a

hal/audio_extn/dolby.c

diff --git a/hal/audio_extn/dolby.c b/hal/audio_extn/dolby.c
index aff1de9..650104c 100644
--- a/hal/audio_extn/dolby.c
+++ b/hal/audio_extn/dolby.c
@@ -243,7 +243,7 @@
             (usecase->devices & ddp_dev) &&
             (usecase->stream.out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) &&
             ((usecase->stream.out->format == AUDIO_FORMAT_AC3) ||
-             (usecase->stream.out->format == AUDIO_FORMAT_EAC3))) {
+             (usecase->stream.out->format == AUDIO_FORMAT_E_AC3))) {
             send_ddp_endp_params_stream(usecase->stream.out, ddp_dev,
                                         dev_ch_cap, false /* set cache */);
         }
@@ -260,7 +260,7 @@
             (usecase->devices & AUDIO_DEVICE_OUT_ALL) &&
             (usecase->stream.out->flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) &&
             ((usecase->stream.out->format == AUDIO_FORMAT_AC3) ||
-             (usecase->stream.out->format == AUDIO_FORMAT_EAC3))) {
+             (usecase->stream.out->format == AUDIO_FORMAT_E_AC3))) {
             /*
              * Use wfd /hdmi sink channel cap for dolby params if device is wfd
              * or hdmi. Otherwise use stereo configuration
@@ -376,7 +376,7 @@
         audio_extn_dolby_set_dmid(adev);
 #endif
         break;
-    case AUDIO_FORMAT_EAC3:
+    case AUDIO_FORMAT_E_AC3:
         id = SND_AUDIOCODEC_EAC3;
         send_ddp_endp_params_stream(out, out->devices,
                             channel_cap, true /* set_cache */);
@@ -394,7 +394,7 @@
 bool audio_extn_is_dolby_format(audio_format_t format)
 {
     if (format == AUDIO_FORMAT_AC3 ||
-            format == AUDIO_FORMAT_EAC3)
+            format == AUDIO_FORMAT_E_AC3)
         return true;
     else
         return false;

hal/audio_extn/utils.c

diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 6bb1b1b..7d5b158 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -74,16 +74,16 @@
     STRING_TO_ENUM(AUDIO_FORMAT_MP3),
     STRING_TO_ENUM(AUDIO_FORMAT_AAC),
     STRING_TO_ENUM(AUDIO_FORMAT_VORBIS),
-#ifdef FORMATS_ENABLED
+    STRING_TO_ENUM(AUDIO_FORMAT_AMR_NB),
+    STRING_TO_ENUM(AUDIO_FORMAT_AMR_WB),
     STRING_TO_ENUM(AUDIO_FORMAT_AC3),
-    STRING_TO_ENUM(AUDIO_FORMAT_EAC3),
+    STRING_TO_ENUM(AUDIO_FORMAT_E_AC3),
+#ifdef FORMATS_ENABLED
     STRING_TO_ENUM(AUDIO_FORMAT_DTS),
     STRING_TO_ENUM(AUDIO_FORMAT_DTS_LBR),
     STRING_TO_ENUM(AUDIO_FORMAT_WMA),
     STRING_TO_ENUM(AUDIO_FORMAT_WMA_PRO),
     STRING_TO_ENUM(AUDIO_FORMAT_AAC_ADIF),
-    STRING_TO_ENUM(AUDIO_FORMAT_AMR_NB),
-    STRING_TO_ENUM(AUDIO_FORMAT_AMR_WB),
     STRING_TO_ENUM(AUDIO_FORMAT_AMR_WB_PLUS),
     STRING_TO_ENUM(AUDIO_FORMAT_EVRC),
     STRING_TO_ENUM(AUDIO_FORMAT_EVRCB),