Encoder explicit signaling

* AAC-Encoder

   - Revise explicit signaling method which is required for downsampled SBR.
     The parameter is optional and default configuration is implicit signaling
     for dualrate SBR as before. In case of downsampled SBR and HE-AAC explicit
     signaling is configured as default.
     Modified file(s):
        documentation\aacEncoder.pdf
        libAACenc\include\aacenc_lib.h
        libAACenc\src\aacenc_lib.cpp
        libMpegTPEnc\src\tpenc_asc.cpp
        libMpegTPEnc\src\version
        libSYS\include\FDK_audio.h
        libSYS\src\genericStds.cpp

Bug 9428126

Change-Id: I35138140346f17384d109ee5829be9ea5bab80fc

2 files changed, 14 insertions, 1 deletions

diff --git a/libSYS/include/FDK_audio.h b/libSYS/include/FDK_audio.h
index e38a326..d2c5f9a 100644
--- a/libSYS/include/FDK_audio.h
+++ b/libSYS/include/FDK_audio.h
@@ -272,6 +272,15 @@ typedef enum {
   ACT_TOP /* Ts */
 } AUDIO_CHANNEL_TYPE;
 
+typedef enum
+{
+  SIG_UNKNOWN                 = -1,
+  SIG_IMPLICIT                =  0,
+  SIG_EXPLICIT_BW_COMPATIBLE  =  1,
+  SIG_EXPLICIT_HIERARCHICAL   =  2
+
+} SBR_PS_SIGNALING;
+
 /**
  * Audio Codec flags.
  */
@@ -334,6 +343,10 @@ typedef struct {
 
   UCHAR      stereoConfigIndex; /**< USAC MPS stereo mode */
   UCHAR      sbrMode;           /**< USAC SBR mode */
+  SBR_PS_SIGNALING sbrSignaling;/**< 0: implicit signaling, 1: backwards compatible explicit signaling, 2: hierarcical explicit signaling */
+
+  UCHAR      sbrPresent;
+  UCHAR      psPresent;
 } CODER_CONFIG;
 
 /** MP4 Element IDs. */
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp
index 92887d1..f293189 100644
--- a/libSYS/src/genericStds.cpp
+++ b/libSYS/src/genericStds.cpp
@@ -99,7 +99,7 @@ amm-info@iis.fraunhofer.de
 /* library info */
 #define SYS_LIB_VL0 1
 #define SYS_LIB_VL1 3
-#define SYS_LIB_VL2 2
+#define SYS_LIB_VL2 3
 #define SYS_LIB_TITLE "System Integration Library"
 #define SYS_LIB_BUILD_DATE __DATE__
 #define SYS_LIB_BUILD_TIME __TIME__