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

8 files changed, 202 insertions, 113 deletions

diff --git a/libAACdec/src/aac_ram.cpp b/libAACdec/src/aac_ram.cpp
index a38f57c..1ff289b 100644
--- a/libAACdec/src/aac_ram.cpp
+++ b/libAACdec/src/aac_ram.cpp
@@ -108,15 +108,15 @@ C_ALLOC_MEM(AacDecoder, AAC_DECODER_INSTANCE, 1)
 /*! The structure CAacDecoderStaticChannelInfo contains the static sideinfo which is needed
     for the decoding of one aac channel. <br>
     Dimension: #AacDecoderChannels                                                      */
-C_ALLOC_MEM2(AacDecoderStaticChannelInfo, CAacDecoderStaticChannelInfo, 1, (6))
+C_ALLOC_MEM2(AacDecoderStaticChannelInfo, CAacDecoderStaticChannelInfo, 1, (8))
 
 /*! The structure CAacDecoderChannelInfo contains the dynamic sideinfo which is needed
     for the decoding of one aac channel. <br>
     Dimension: #AacDecoderChannels                                                      */
-C_ALLOC_MEM2(AacDecoderChannelInfo, CAacDecoderChannelInfo, 1, (6))
+C_AALLOC_MEM2(AacDecoderChannelInfo, CAacDecoderChannelInfo, 1, (8))
 
 /*! Overlap buffer */
-C_ALLOC_MEM2(OverlapBuffer, FIXP_DBL, OverlapBufferSize, (6))
+C_ALLOC_MEM2(OverlapBuffer, FIXP_DBL, OverlapBufferSize, (8))
 
 C_ALLOC_MEM(DrcInfo, CDrcInfo, 1)
 
@@ -128,7 +128,7 @@ C_ALLOC_MEM(DrcInfo, CDrcInfo, 1)
   Dynamic memory areas, might be reused in other algorithm sections,
   e.g. the sbr decoder
 */
-C_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL, ((6)*1024), SECT_DATA_L2, WORKBUFFER2_TAG)
+C_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL, ((8)*1024), SECT_DATA_L2, WORKBUFFER2_TAG)
 
 
 C_ALLOC_MEM_OVERLAY(WorkBufferCore1, CWorkBufferCore1, 1, SECT_DATA_L1, WORKBUFFER1_TAG)
diff --git a/libAACdec/src/aac_rom.cpp b/libAACdec/src/aac_rom.cpp
index fa04c42..607cb3b 100644
--- a/libAACdec/src/aac_rom.cpp
+++ b/libAACdec/src/aac_rom.cpp
@@ -1777,42 +1777,62 @@ const FIXP_TCC FDKaacDec_tnsCoeff4 [16] =
 };
 
 /* MPEG like mapping (no change). */
-const UCHAR channelMappingTablePassthrough[8][8] =
+const UCHAR channelMappingTablePassthrough[15][8] =
 {
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  fallback  */
      { 0,  1,255,255,255,255,255,255},  /*  mono / PS */
      { 0,  1,255,255,255,255,255,255},  /*  stereo    */
      { 0,  1,  2,255,255,255,255,255},  /*  3ch       */
      { 0,  1,  2,  3,255,255,255,255},  /*  4ch       */
      { 0,  1,  2,  3,  4,255,255,255},  /*  5ch       */
      { 0,  1,  2,  3,  4,  5,255,255},  /*  5.1ch     */
-     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  7ch       */
-     { 0,  1,  2,  3,  4,  5,  6,  7}   /*  7.1ch     */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  7.1 front */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,255},  /*  6.1ch     */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  7.1 rear  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,  7}   /*  7.1 top   */
 };
 
 /* WAV file like mapping (from MPEG mapping). */
-const UCHAR channelMappingTableWAV[8][8] =
+const UCHAR channelMappingTableWAV[15][8] =
 {
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  fallback  */
      { 0,  1,255,255,255,255,255,255},  /*  mono / PS */
      { 0,  1,255,255,255,255,255,255},  /*  stereo    */
      { 2,  0,  1,255,255,255,255,255},  /*  3ch       */
      { 2,  0,  1,  3,255,255,255,255},  /*  4ch       */
      { 2,  0,  1,  3,  4,255,255,255},  /*  5ch       */
      { 2,  0,  1,  4,  5,  3,255,255},  /*  5.1ch     */
-     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  7ch       */
-     { 2,  0,  1,  6,  7,  4,  5,  3}   /*  7.1ch     */
+     { 2,  6,  7,  0,  1,  4,  5,  3},  /*  7.1 front */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 2,  0,  1,  4,  5,  6,  3,255},  /*  6.1ch     */
+     { 2,  0,  1,  6,  7,  4,  5,  3},  /*  7.1 rear  */
+     { 0,  1,  2,  3,  4,  5,  6,  7},  /*  reserved  */
+     { 2,  0,  1,  4,  5,  3,  6,  7}   /*  7.1 top   */
 };
 
 /* Lookup tables for elements in ER bitstream */
-const MP4_ELEMENT_ID elementsTab[8][7] =
+const MP4_ELEMENT_ID elementsTab[15][7] =
 {
-  {ID_SCE, ID_EXT, ID_END, ID_NONE, ID_NONE,ID_NONE,ID_NONE }, /* 1 channel  */
-  {ID_CPE, ID_EXT, ID_END, ID_NONE, ID_NONE,ID_NONE,ID_NONE }  /* 2 channels */
-  ,
-  {ID_SCE, ID_CPE, ID_EXT, ID_END, ID_NONE,ID_NONE,ID_NONE }, /* 3 channels */
-  {ID_SCE, ID_CPE, ID_SCE, ID_EXT, ID_END, ID_NONE,ID_NONE }, /* 4 channels */
-  {ID_SCE, ID_CPE, ID_CPE, ID_EXT, ID_END, ID_NONE,ID_NONE }, /* 5 channels */
-  {ID_SCE, ID_CPE, ID_CPE, ID_LFE, ID_EXT, ID_END, ID_NONE }, /* 6 channels */
-  {ID_SCE, ID_CPE, ID_CPE, ID_CPE, ID_LFE, ID_EXT, ID_END}    /* 8 channels */
+ /*  1 */  { ID_SCE,  ID_EXT,  ID_END,  ID_NONE, ID_NONE, ID_NONE, ID_NONE }, /* 1 channel  */
+ /*  2 */  { ID_CPE,  ID_EXT,  ID_END,  ID_NONE, ID_NONE, ID_NONE, ID_NONE }  /* 2 channels */
+ /*  3 */ ,{ ID_SCE,  ID_CPE,  ID_EXT,  ID_END,  ID_NONE, ID_NONE, ID_NONE }, /* 3 channels */
+ /*  4 */  { ID_SCE,  ID_CPE,  ID_SCE,  ID_EXT,  ID_END,  ID_NONE, ID_NONE }, /* 4 channels */
+ /*  5 */  { ID_SCE,  ID_CPE,  ID_CPE,  ID_EXT,  ID_END,  ID_NONE, ID_NONE }, /* 5 channels */
+ /*  6 */  { ID_SCE,  ID_CPE,  ID_CPE,  ID_LFE,  ID_EXT,  ID_END,  ID_NONE }  /* 6 channels */
+ /*  7 */ ,{ ID_SCE,  ID_CPE,  ID_CPE,  ID_CPE,  ID_LFE,  ID_EXT,  ID_END  },  /* 8 channels */
+ /*  8 */  { ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE },  /* reserved   */
+ /*  9 */  { ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE },  /* reserved   */
+ /* 10 */  { ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE },  /* reserved   */
+ /* 11 */  { ID_SCE,  ID_CPE,  ID_CPE,  ID_SCE,  ID_LFE,  ID_EXT,  ID_END  },  /* 7 channels */
+ /* 12 */  { ID_SCE,  ID_CPE,  ID_CPE,  ID_CPE,  ID_LFE,  ID_EXT,  ID_END  },  /* 8 channels */
+ /* 13 */  { ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE, ID_NONE },  /* reserved   */
+ /* 14 */  { ID_SCE,  ID_CPE,  ID_CPE,  ID_LFE,  ID_CPE,  ID_EXT,  ID_END  }   /* 8 channels */
 };
 
 /*! Random sign bit used for concealment
diff --git a/libAACdec/src/aac_rom.h b/libAACdec/src/aac_rom.h
index 536d184..f314a2d 100644
--- a/libAACdec/src/aac_rom.h
+++ b/libAACdec/src/aac_rom.h
@@ -177,11 +177,12 @@ extern const USHORT randomSign[AAC_NF_NO_RANDOM_VAL/16];
 extern const FIXP_DBL pow2_div24minus1[47];
 extern const int offsetTab[2][16];
 
-/* Channel mapping indices for time domain I/O. First dimension is channel count-1. */
-extern const UCHAR channelMappingTablePassthrough[8][8];
-extern const UCHAR channelMappingTableWAV[8][8];
+/* Channel mapping indices for time domain I/O.
+   The first dimension is the channel configuration index. */
+extern const UCHAR channelMappingTablePassthrough[15][8];
+extern const UCHAR channelMappingTableWAV[15][8];
 
 /* Lookup tables for elements in ER bitstream */
-extern const MP4_ELEMENT_ID elementsTab[8][7];
+extern const MP4_ELEMENT_ID elementsTab[15][7];
 
 #endif /* #ifndef AAC_ROM_H */
diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp
index 2666454..bc74ddf 100644
--- a/libAACdec/src/aacdec_drc.cpp
+++ b/libAACdec/src/aacdec_drc.cpp
@@ -539,7 +539,7 @@ static int aacDecoder_drcReadCompression (
     UINT                  payloadPosition )
 {
   int  bitCnt = 0;
-  int  dmxLevelsPresent, compressionPresent;
+  int  dmxLevelsPresent, extensionPresent, compressionPresent;
   int  coarseGrainTcPresent, fineGrainTcPresent;
 
   /* Move to the beginning of the DRC payload field */
@@ -562,7 +562,8 @@ static int aacDecoder_drcReadCompression (
   }
   FDKreadBits(bs, 2);                          /* dolby_surround_mode */
   FDKreadBits(bs, 2);                          /* presentation_mode */
-  if (FDKreadBits(bs, 2) != 0) {               /* reserved, set to 0 */
+  FDKreadBits(bs, 1);                          /* stereo_downmix_mode */
+  if (FDKreadBits(bs, 1) != 0) {               /* reserved, set to 0 */
     return 0;
   }
 
@@ -571,9 +572,7 @@ static int aacDecoder_drcReadCompression (
     return 0;
   }
   dmxLevelsPresent = FDKreadBits(bs, 1);       /* downmixing_levels_MPEG4_status */
-  if (FDKreadBits(bs, 1) != 0) {               /* reserved, set to 0 */
-    return 0;
-  }
+  extensionPresent = FDKreadBits(bs, 1);       /* ancillary_data_extension_status; */
   compressionPresent   = FDKreadBits(bs, 1);   /* audio_coding_mode_and_compression status */
   coarseGrainTcPresent = FDKreadBits(bs, 1);   /* coarse_grain_timecode_status */
   fineGrainTcPresent   = FDKreadBits(bs, 1);   /* fine_grain_timecode_status */
@@ -631,6 +630,19 @@ static int aacDecoder_drcReadCompression (
     bitCnt += 16;
   }
 
+  /* Read extension just to get the right amount of bits. */
+  if (extensionPresent) {
+    int  extBits = 8;
+
+    FDKreadBits(bs, 1);                     /* reserved, set to 0 */
+    if (FDKreadBits(bs, 1)) extBits += 8;   /* ext_downmixing_levels_status */
+    if (FDKreadBits(bs, 1)) extBits += 16;  /* ext_downmixing_global_gains_status */
+    if (FDKreadBits(bs, 1)) extBits += 8;   /* ext_downmixing_lfe_level_status */
+
+    FDKpushFor(bs, extBits - 4);            /* skip the extension payload remainder. */
+    bitCnt += extBits;
+  }
+
   return (bitCnt);
 }
 
diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index 3a2a561..7903f76 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -338,17 +338,22 @@ AAC_DECODER_ERROR CAacDecoder_AncDataParse (
   \return  Error code
 */
 static AAC_DECODER_ERROR CDataStreamElement_Read (
+                                                  HANDLE_AACDECODER    self,
                                                   HANDLE_FDK_BITSTREAM bs,
-                                                  CAncData *ancData,
-                                                  HANDLE_AAC_DRC hDrcInfo,
-                                                  HANDLE_TRANSPORTDEC pTp,
                                                   UCHAR    *elementInstanceTag,
                                                   UINT      alignmentAnchor )
 {
+  HANDLE_TRANSPORTDEC  pTp;
+  CAncData *ancData;
   AAC_DECODER_ERROR error = AAC_DEC_OK;
-  UINT dataStart;
+  UINT dataStart, dseBits;
   int dataByteAlignFlag, count;
 
+  FDK_ASSERT(self != NULL);
+
+  ancData = &self->ancData;
+  pTp = self->hInput;
+
   int crcReg = transportDec_CrcStartReg(pTp, 0);
 
   /* Element Instance Tag */
@@ -361,6 +366,7 @@ static AAC_DECODER_ERROR CDataStreamElement_Read (
   if (count == 255) {
     count += FDKreadBits(bs,8); /* EscCount */
   }
+  dseBits = count*8;
 
   if (dataByteAlignFlag) {
     FDKbyteAlign(bs, alignmentAnchor);
@@ -372,19 +378,29 @@ static AAC_DECODER_ERROR CDataStreamElement_Read (
   transportDec_CrcEndReg(pTp, crcReg);
 
   {
-    INT readBits, dataBits = count<<3;
-
     /* Move to the beginning of the data junk */
     FDKpushBack(bs, dataStart-FDKgetValidBits(bs));
 
     /* Read Anc data if available */
-    readBits = aacDecoder_drcMarkPayload( hDrcInfo, bs, DVB_DRC_ANC_DATA );
+    aacDecoder_drcMarkPayload( self->hDrcInfo, bs, DVB_DRC_ANC_DATA );
+  }
+
+  {
+    PCMDMX_ERROR dmxErr = PCMDMX_OK;
 
-    if (readBits != dataBits) {
-      /* Move to the end again. */
-      FDKpushBiDirectional(bs, FDKgetValidBits(bs)-dataStart+dataBits);
+    /* Move to the beginning of the data junk */
+    FDKpushBack(bs, dataStart-FDKgetValidBits(bs));
+
+    /* Read DMX meta-data */
+    dmxErr = pcmDmx_Parse (
+                     self->hPcmUtils,
+                     bs,
+                     dseBits,
+                     0 /* not mpeg2 */ );
     }
-  }
+
+  /* Move to the very end of the element. */
+  FDKpushBiDirectional(bs, FDKgetValidBits(bs)-dataStart+dseBits);
 
   return error;
 }
@@ -774,7 +790,7 @@ LINKSPEC_CPP void CAacDecoder_Close(HANDLE_AACDECODER self)
   if (self == NULL)
     return;
 
-  for (ch=0; ch<(6); ch++) {
+  for (ch=0; ch<(8); ch++) {
     if (self->pAacDecoderStaticChannelInfo[ch] != NULL) {
       if (self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer != NULL) {
         FreeOverlapBuffer (&self->pAacDecoderStaticChannelInfo[ch]->pOverlapBuffer);
@@ -851,18 +867,19 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_Init(HANDLE_AACDECODER self, const CS
         /* valid number of channels -> copy program config element (PCE) from ASC */
         FDKmemcpy(&self->pce, &asc->m_progrConfigElement, sizeof(CProgramConfig));
         /* Built element table */
-        el = CProgramConfig_GetElementTable(&asc->m_progrConfigElement, self->elements, 7);
-        for (; el<7; el++) {
+        el = CProgramConfig_GetElementTable(&asc->m_progrConfigElement, self->elements, (8), &self->chMapIndex);
+        for (; el<(8); el++) {
           self->elements[el] = ID_NONE;
         }
       } else {
         return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
       }
     } else {
+      self->chMapIndex = 0;
       if (transportDec_GetFormat(self->hInput) == TT_MP4_ADTS) {
         /* set default max_channels for memory allocation because in implicit channel mapping mode
            we don't know the actual number of channels until we processed at least one raw_data_block(). */
-        ascChannels = (6);
+        ascChannels = (8);
       } else {
         return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
       }
@@ -874,26 +891,34 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_Init(HANDLE_AACDECODER self, const CS
   case 1: case 2: case 3: case 4: case 5: case 6:
     ascChannels = asc->m_channelConfiguration;
     break;
-  case 7:
+  case 11:
+    ascChannels = 7;
+    break;
+  case 7: case 12: case 14:
     ascChannels = 8;
     break;
   default:
     return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
   }
 
+  if (ascChannels > (8)) {
+    return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
+  }
+
   /* Initialize constant mappings for channel config 1-7 */
   if (asc->m_channelConfiguration > 0) {
     int el;
-    FDKmemcpy(self->elements, elementsTab[asc->m_channelConfiguration-1], sizeof(MP4_ELEMENT_ID)*FDKmin(7,7));
-    for (el=7; el<7; el++) {
+    FDKmemcpy(self->elements, elementsTab[asc->m_channelConfiguration-1], sizeof(MP4_ELEMENT_ID)*FDKmin(7,(8)));
+    for (el=7; el<(8); el++) {
       self->elements[el] = ID_NONE;
     }
     for (ch=0; ch<ascChannels; ch++) {
       self->chMapping[ch] = ch;
     }
-    for (; ch<(6); ch++) {
+    for (; ch<(8); ch++) {
       self->chMapping[ch] = 255;
     }
+    self->chMapIndex = asc->m_channelConfiguration;
   }
  #ifdef TP_PCE_ENABLE
   else {
@@ -909,9 +934,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_Init(HANDLE_AACDECODER self, const CS
 
   self->streamInfo.channelConfig = asc->m_channelConfiguration;
 
-  if (ascChannels > (6)) {
-    return AAC_DEC_UNSUPPORTED_CHANNELCONFIG;
-  }
   if (self->streamInfo.aot != asc->m_aot) {
     self->streamInfo.aot = asc->m_aot;
     ascChanged = 1;
@@ -1096,6 +1118,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
 
   MP4_ELEMENT_ID type = ID_NONE;            /* Current element type */
   INT aacChannels=0;                        /* Channel counter for channels found in the bitstream */
+  int chOutMapIdx;                          /* Output channel mapping index (see comment below) */
 
   INT auStartAnchor = (INT)FDKgetValidBits(bs);  /* AU start bit buffer position for AU byte alignment */
 
@@ -1119,12 +1142,12 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
 
     if (self->streamInfo.channelConfig == 0) {
       /* Init Channel/Element mapping table */
-      for (ch=0; ch<(6); ch++) {
+      for (ch=0; ch<(8); ch++) {
         self->chMapping[ch] = 255;
       }
       if (!CProgramConfig_IsValid(pce)) {
         int el;
-        for (el=0; el<7; el++) {
+        for (el=0; el<(8); el++) {
           self->elements[el] = ID_NONE;
         }
       }
@@ -1378,10 +1401,8 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
         {
           UCHAR element_instance_tag;
 
-          CDataStreamElement_Read( bs,
-                                  &self->ancData,
-                                   self->hDrcInfo,
-                                   self->hInput,
+          CDataStreamElement_Read( self,
+                                   bs,
                                   &element_instance_tag,
                                    auStartAnchor );
 
@@ -1401,29 +1422,6 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
             //self->frameOK = 0;
           }
         }
-
-        {
-          UCHAR *pDvbAncData = NULL;
-          AAC_DECODER_ERROR ancErr;
-          int ancIndex;
-          int dvbAncDataSize = 0;
-
-          /* Ask how many anc data elements are in buffer */
-          ancIndex = self->ancData.nrElements - 1;
-          /* Get the last one (if available) */
-          ancErr   = CAacDecoder_AncDataGet( &self->ancData,
-                                              ancIndex,
-                                             &pDvbAncData,
-                                             &dvbAncDataSize );
-
-          if (ancErr == AAC_DEC_OK) {
-            pcmDmx_ReadDvbAncData (
-                  self->hPcmUtils,
-                  pDvbAncData,
-                  dvbAncDataSize,
-                  0 /* not mpeg2 */ );
-          }
-        }
         break;
 
 #ifdef TP_PCE_ENABLE
@@ -1442,9 +1440,9 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
           }
           else if ( result > 1 ) {
             /* Built element table */
-            int elIdx = CProgramConfig_GetElementTable(pce, self->elements, 7);
+            int elIdx = CProgramConfig_GetElementTable(pce, self->elements, (8), &self->chMapIndex);
             /* Reset the remaining tabs */
-            for ( ; elIdx<7; elIdx++) {
+            for ( ; elIdx<(8); elIdx++) {
               self->elements[elIdx] = ID_NONE;
             }
             /* Make new number of channel persistant */
@@ -1632,6 +1630,23 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
     return ErrorStatus;
   }
 
+  /* Setup the output channel mapping. The table below shows the four possibilities:
+   *   # | chCfg | PCE | cChCfg | chOutMapIdx
+   *  ---+-------+-----+--------+------------------
+   *   1 |  > 0  |  no |    -   | chCfg
+   *   2 |   0   | yes |  > 0   | cChCfg
+   *   3 |   0   | yes |    0   | aacChannels || 0
+   *   4 |   0   |  no |    -   | aacChannels || 0
+   *  ---+-------+-----+--------+------------------
+   *  Where chCfg is the channel configuration index from ASC and cChCfg is a corresponding chCfg
+   *  derived from a given PCE. The variable aacChannels represents the number of channel found
+   *  during bitstream decoding. Due to the structure of the mapping table it can only be used for
+   *  mapping if its value is smaller than 7. Otherwise we use the fallback (0) which is a simple
+   *  pass-through. The possibility #4 should appear only with MPEG-2 (ADTS) streams. This is
+   *  mode is called "implicit channel mapping".
+   */
+  chOutMapIdx = ((self->chMapIndex==0) && (aacChannels<7)) ? aacChannels : self->chMapIndex;
+
   /*
     Inverse transform
   */
@@ -1663,10 +1678,10 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
       /* Setup offset and stride for time buffer traversal. */
       if (interleaved) {
         stride = aacChannels;
-        offset = self->channelOutputMapping[aacChannels-1][c];
+        offset = self->channelOutputMapping[chOutMapIdx][c];
       } else {
         stride = 1;
-        offset = self->channelOutputMapping[aacChannels-1][c] * self->streamInfo.aacSamplesPerFrame;
+        offset = self->channelOutputMapping[chOutMapIdx][c] * self->streamInfo.aacSamplesPerFrame;
       }
 
 
@@ -1746,8 +1761,8 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
 
   /* Reorder channel type information tables.  */
   {
-    AUDIO_CHANNEL_TYPE types[(6)];
-    UCHAR idx[(6)];
+    AUDIO_CHANNEL_TYPE types[(8)];
+    UCHAR idx[(8)];
     int c;
 
     FDK_ASSERT(sizeof(self->channelType) == sizeof(types));
@@ -1757,8 +1772,8 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
     FDKmemcpy(idx, self->channelIndices, sizeof(idx));
 
     for (c=0; c<aacChannels; c++) {
-      self->channelType[self->channelOutputMapping[aacChannels-1][c]] = types[c];
-      self->channelIndices[self->channelOutputMapping[aacChannels-1][c]] = idx[c];
+      self->channelType[self->channelOutputMapping[chOutMapIdx][c]] = types[c];
+      self->channelIndices[self->channelOutputMapping[chOutMapIdx][c]] = idx[c];
     }
   }
 
diff --git a/libAACdec/src/aacdecoder.h b/libAACdec/src/aacdecoder.h
index 16351e6..f581054 100644
--- a/libAACdec/src/aacdecoder.h
+++ b/libAACdec/src/aacdecoder.h
@@ -176,22 +176,23 @@ struct AAC_DECODER_INSTANCE {
 
   UINT                  flags;                       /*!< Flags for internal decoder use. DO NOT USE self::streaminfo::flags ! */
 
-  MP4_ELEMENT_ID        elements[7]; /*!< Table where the element Id's are listed          */
-  UCHAR                 elTags[7];   /*!< Table where the elements id Tags are listed      */
-  UCHAR                 chMapping[(6)];   /*!< Table of MPEG canonical order to bitstream channel order mapping. */
+  MP4_ELEMENT_ID        elements[(8)]; /*!< Table where the element Id's are listed          */
+  UCHAR                 elTags[(8)];   /*!< Table where the elements id Tags are listed      */
+  UCHAR                 chMapping[(8)];   /*!< Table of MPEG canonical order to bitstream channel order mapping. */
 
-  AUDIO_CHANNEL_TYPE    channelType[(6)];    /*!< Audio channel type of each output audio channel (from 0 upto numChannels).           */
-  UCHAR                 channelIndices[(6)]; /*!< Audio channel index for each output audio channel (from 0 upto numChannels).         */
+  AUDIO_CHANNEL_TYPE    channelType[(8)];    /*!< Audio channel type of each output audio channel (from 0 upto numChannels).           */
+  UCHAR                 channelIndices[(8)]; /*!< Audio channel index for each output audio channel (from 0 upto numChannels).         */
                                                              /* See ISO/IEC 13818-7:2005(E), 8.5.3.2 Explicit channel mapping using a program_config_element() */
 
 
   const UCHAR         (*channelOutputMapping)[8];    /*!< Table for MPEG canonical order to output channel order mapping. */
-
+  UCHAR                 chMapIndex;                  /*!< Index to access one line of the channelOutputMapping table. This is required
+                                                          because not all 8 channel configurations have the same output mapping. */
 
   CProgramConfig                pce;
   CStreamInfo                   streamInfo;         /*!< pointer to StreamInfo data (read from the bitstream) */
-  CAacDecoderChannelInfo       *pAacDecoderChannelInfo[(6)];       /*!< Temporal channel memory */
-  CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo[(6)]; /*!< Persistent channel memory */
+  CAacDecoderChannelInfo       *pAacDecoderChannelInfo[(8)];       /*!< Temporal channel memory */
+  CAacDecoderStaticChannelInfo *pAacDecoderStaticChannelInfo[(8)]; /*!< Persistent channel memory */
 
   CAacDecoderCommonData         aacCommonData;             /*!< Temporal shared data for all channels hooked into pAacDecoderChannelInfo */
 
diff --git a/libAACdec/src/aacdecoder_lib.cpp b/libAACdec/src/aacdecoder_lib.cpp
index ec8f41e..d1b895d 100644
--- a/libAACdec/src/aacdecoder_lib.cpp
+++ b/libAACdec/src/aacdecoder_lib.cpp
@@ -110,7 +110,7 @@ amm-info@iis.fraunhofer.de
 /* Decoder library info */
 #define AACDECODER_LIB_VL0 2
 #define AACDECODER_LIB_VL1 5
-#define AACDECODER_LIB_VL2 5
+#define AACDECODER_LIB_VL2 6
 #define AACDECODER_LIB_TITLE "AAC Decoder Lib"
 #define AACDECODER_LIB_BUILD_DATE __DATE__
 #define AACDECODER_LIB_BUILD_TIME __TIME__
@@ -420,8 +420,8 @@ aacDecoder_SetParam ( const HANDLE_AACDECODER  self,   /*!< Handle of the decode
     self->outputInterleaved = value;
     break;
 
-  case AAC_PCM_OUTPUT_CHANNELS:
-    if (value < -1 || value > (6)) {
+  case AAC_PCM_MIN_OUTPUT_CHANNELS:
+    if (value < -1 || value > (8)) {
       return AAC_DEC_SET_PARAM_FAIL;
     }
     {
@@ -429,7 +429,30 @@ aacDecoder_SetParam ( const HANDLE_AACDECODER  self,   /*!< Handle of the decode
 
       err = pcmDmx_SetParam (
               hPcmDmx,
-              NUMBER_OF_OUTPUT_CHANNELS,
+              MIN_NUMBER_OF_OUTPUT_CHANNELS,
+              value );
+
+      switch (err) {
+      case PCMDMX_OK:
+        break;
+      case PCMDMX_INVALID_HANDLE:
+        return AAC_DEC_INVALID_HANDLE;
+      default:
+        return AAC_DEC_SET_PARAM_FAIL;
+      }
+    }
+    break;
+
+  case AAC_PCM_MAX_OUTPUT_CHANNELS:
+    if (value < -1 || value > (8)) {
+      return AAC_DEC_SET_PARAM_FAIL;
+    }
+    {
+      PCMDMX_ERROR err;
+
+      err = pcmDmx_SetParam (
+              hPcmDmx,
+              MAX_NUMBER_OF_OUTPUT_CHANNELS,
               value );
 
       switch (err) {
@@ -449,7 +472,7 @@ aacDecoder_SetParam ( const HANDLE_AACDECODER  self,   /*!< Handle of the decode
 
       err = pcmDmx_SetParam (
               hPcmDmx,
-              DUAL_CHANNEL_DOWNMIX_MODE,
+              DMX_DUAL_CHANNEL_MODE,
               value );
 
       switch (err) {
@@ -825,6 +848,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(
     if (self->sbrEnabled)
     {
       SBR_ERROR sbrError = SBRDEC_OK;
+      int chOutMapIdx = ((self->chMapIndex==0) && (self->streamInfo.numChannels<7)) ? self->streamInfo.numChannels : self->chMapIndex;
 
       /* set params */
       sbrDecoder_SetParam ( self->hSbrDecoder,
@@ -838,7 +862,16 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(
                               (self->flags & AC_LD_MPS) ? 1 : 0 );
       }
 
+      {
+        PCMDMX_ERROR dmxErr;
+        INT  maxOutCh = 0;
 
+        dmxErr = pcmDmx_GetParam(self->hPcmUtils, MAX_NUMBER_OF_OUTPUT_CHANNELS, &maxOutCh);
+        if ( (dmxErr == PCMDMX_OK) && (maxOutCh == 1) ) {
+          /* Disable PS processing if we have to create a mono output signal. */
+          self->psPossible = 0;
+        }
+      }
 
 
       /* apply SBR processing */
@@ -846,7 +879,7 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(
                                     pTimeData,
                                    &self->streamInfo.numChannels,
                                    &self->streamInfo.sampleRate,
-                                    self->channelOutputMapping[self->streamInfo.numChannels-1],
+                                    self->channelOutputMapping[chOutMapIdx],
                                     interleaved,
                                     self->frameOK,
                                    &self->psPossible);
@@ -870,19 +903,19 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(
          self->channelType[1] = ACT_FRONT;
          self->channelIndices[0] = 0;
          self->channelIndices[1] = 1;
-       } else {
-         self->flags &= ~AC_PS_PRESENT;
        }
      }
    }
 
 
+    {
+    PCMDMX_ERROR dmxErr = PCMDMX_OK;
     if ( flags & (AACDEC_INTR | AACDEC_CLRHIST) ) {
       /* delete data from the past (e.g. mixdown coeficients) */
       pcmDmx_Reset( self->hPcmUtils, PCMDMX_RESET_BS_DATA );
     }
     /* do PCM post processing */
-    pcmDmx_ApplyFrame (
+    dmxErr = pcmDmx_ApplyFrame (
             self->hPcmUtils,
             pTimeData,
             self->streamInfo.frameSize,
@@ -890,9 +923,15 @@ LINKSPEC_CPP AAC_DECODER_ERROR aacDecoder_DecodeFrame(
             interleaved,
             self->channelType,
             self->channelIndices,
-            self->channelOutputMapping
+            self->channelOutputMapping,
+            NULL
       );
-
+    if (dmxErr == PCMDMX_INVALID_MODE) {
+      /* Announce the framework that the current combination of channel configuration and downmix
+       * settings are not know to produce a predictable behavior and thus maybe produce strange output. */
+      ErrorStatus = AAC_DEC_DECODE_FRAME_ERROR;
+    }
+    }
 
 
     /* Signal interruption to take effect in next frame. */
diff --git a/libAACdec/src/conceal.cpp b/libAACdec/src/conceal.cpp
index c26051c..1c313ef 100644
--- a/libAACdec/src/conceal.cpp
+++ b/libAACdec/src/conceal.cpp
@@ -762,7 +762,6 @@ int
   CConcealment_UpdateState( hConcealmentInfo,
                             frameOk );
 
-  if ( !frameOk )
   {
     /* Create data for signal rendering according to the selected concealment method and decoder operating mode. */
 
@@ -775,11 +774,13 @@ int
       {
       default:
       case ConcealMethodMute:
-        /* Mute spectral data in case of errors */
-        FDKmemclear(pAacDecoderChannelInfo->pSpectralCoefficient, samplesPerFrame * sizeof(FIXP_DBL));
-        /* Set last window shape */
-        pAacDecoderChannelInfo->icsInfo.WindowShape = hConcealmentInfo->windowShape;
-        appliedProcessing = 1;
+        if (!frameOk) {
+          /* Mute spectral data in case of errors */
+          FDKmemclear(pAacDecoderChannelInfo->pSpectralCoefficient, samplesPerFrame * sizeof(FIXP_DBL));
+          /* Set last window shape */
+          pAacDecoderChannelInfo->icsInfo.WindowShape = hConcealmentInfo->windowShape;
+          appliedProcessing = 1;
+        }
         break;
 
       case ConcealMethodNoise:
@@ -801,7 +802,7 @@ int
                                    pSamplingRateInfo,
                                    samplesPerFrame,
                                    0,  /* don't use tonal improvement */
-                                   0);
+                                   frameOk);
         break;
 
       }