AAC Decoder: support 6.1/7.1 decoded as 5.1

   - Add 6.1 and 7.1 channel support including downmixer. Per default the
     decoder creates a 5.1 channel output for all streams with more than six
     encoded channels.
     Modified file(s):
        libPCMutils/include/pcmutils_lib.h
        libPCMutils/src/pcmutils_lib.cpp
        libAACdec/include/aacdecoder_lib.h
        libAACdec/src/aac_rom.h
        libAACdec/src/aacdecoder.cpp
        libAACdec/src/aac_ram.cpp
        libAACdec/src/aacdec_drc.cpp
        libAACdec/src/aacdecoder_lib.cpp
        libAACdec/src/aac_rom.cpp
        libAACdec/src/aacdecoder.h
        libSBRdec/include/sbrdecoder.h
        libSBRdec/src/sbrdec_drc.h
        libSBRdec/src/sbrdecoder.cpp
        libSBRdec/src/sbr_ram.cpp
        libSBRdec/src/sbr_ram.h
        libMpegTPDec/include/tp_data.h
        libMpegTPDec/include/tpdec_lib.h
        libMpegTPDec/src/version
        libMpegTPDec/src/tpdec_asc.cpp
        libMpegTPEnc/include/tp_data.h
        libMpegTPEnc/src/version
        libSYS/include/FDK_audio.h
        libSYS/src/genericStds.cpp

   - Fix error concealment modules fade-out/in mechanism.
     Modified file(s):
        libAACdec/src/conceal.cpp

Bug 9428126

Change-Id: I3230bd2072314b730911cd7ec1740e290cb1d254

1 files changed, 22 insertions, 10 deletions

diff --git a/libSYS/include/FDK_audio.h b/libSYS/include/FDK_audio.h
index c8d9c19..97770a7 100644
--- a/libSYS/include/FDK_audio.h
+++ b/libSYS/include/FDK_audio.h
@@ -263,17 +263,29 @@ typedef enum {
 
 } CHANNEL_MODE;
 
-/** Speaker description tags */
+/**
+ * Speaker description tags.
+ * Do not change the enumeration values unless it keeps the following segmentation:
+ * - Bit 0-3: Horizontal postion (0: none, 1: front, 2: side, 3: back, 4: lfe)
+ * - Bit 4-7: Vertical position (0: normal, 1: top, 2: bottom)
+ */
 typedef enum {
-  ACT_NONE,
-  ACT_FRONT,
-  ACT_SIDE,
-  ACT_BACK,
-  ACT_LFE,
-  ACT_FRONT_TOP,
-  ACT_SIDE_TOP,
-  ACT_BACK_TOP,
-  ACT_TOP /* Ts */
+  ACT_NONE         = 0x00,
+  ACT_FRONT        = 0x01,  /*!< Front speaker position (at normal height) */
+  ACT_SIDE         = 0x02,  /*!< Side speaker position (at normal height) */
+  ACT_BACK         = 0x03,  /*!< Back speaker position (at normal height) */
+  ACT_LFE          = 0x04,  /*!< Low frequency effect speaker postion (front) */
+
+  ACT_TOP          = 0x10,  /*!< Top speaker area (for combination with speaker positions) */
+  ACT_FRONT_TOP    = 0x11,  /*!< Top front speaker = (ACT_FRONT|ACT_TOP) */
+  ACT_SIDE_TOP     = 0x12,  /*!< Top side speaker  = (ACT_SIDE |ACT_TOP) */
+  ACT_BACK_TOP     = 0x13,  /*!< Top back speaker  = (ACT_BACK |ACT_TOP) */
+
+  ACT_BOTTOM       = 0x20,  /*!< Bottom speaker area (for combination with speaker positions) */
+  ACT_FRONT_BOTTOM = 0x21,  /*!< Bottom front speaker = (ACT_FRONT|ACT_BOTTOM) */
+  ACT_SIDE_BOTTOM  = 0x22,  /*!< Bottom side speaker  = (ACT_SIDE |ACT_BOTTOM) */
+  ACT_BACK_BOTTOM  = 0x23   /*!< Bottom back speaker  = (ACT_BACK |ACT_BOTTOM) */
+
 } AUDIO_CHANNEL_TYPE;
 
 typedef enum