diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-29 12:29:46 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2013-09-03 11:31:55 -0700 |
| commit | dbf96806482b2c48de4ba1da9a03e2bb7516b8c2 (patch) | |
| tree | 102531985954bb98d15bbf7dfe8495f33e8ed4ca /libSYS | |
| parent | 3aec97e388e29a1d03f0197b27b893bc6aaf8ac3 (diff) | |
| download | fdk-aac-dabplus-dbf96806482b2c48de4ba1da9a03e2bb7516b8c2.tar.gz fdk-aac-dabplus-dbf96806482b2c48de4ba1da9a03e2bb7516b8c2.tar.bz2 fdk-aac-dabplus-dbf96806482b2c48de4ba1da9a03e2bb7516b8c2.zip | |
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
Diffstat (limited to 'libSYS')
| -rw-r--r-- | libSYS/include/FDK_audio.h | 13 | ||||
| -rw-r--r-- | libSYS/src/genericStds.cpp | 2 |
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__ |