diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-04-09 05:44:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-09 05:44:33 +0000 |
| commit | 4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee (patch) | |
| tree | 626b5c026f23b0c8ec4dab155faf86d55cd9d94e /libSBRenc/src/sbr_def.h | |
| parent | 20e8db77ff09cefbe191f1e50815ff8f971a3353 (diff) | |
| parent | 125815b0ed558c72bb019a2d36c662e5e7f7c030 (diff) | |
| download | fdk-aac-4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee.tar.gz fdk-aac-4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee.tar.bz2 fdk-aac-4a5a256a01c0f6aa0ebd1b94bba77a70fcac75ee.zip | |
AAC/SBR encoder improvements am: 46ba367
am: 125815b
* commit '125815b0ed558c72bb019a2d36c662e5e7f7c030':
AAC/SBR encoder improvements
Change-Id: I4ef0a1959666e21ace6086f184302aed640043f6
Diffstat (limited to 'libSBRenc/src/sbr_def.h')
| -rw-r--r-- | libSBRenc/src/sbr_def.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libSBRenc/src/sbr_def.h b/libSBRenc/src/sbr_def.h index 8b7cfc6..85ac587 100644 --- a/libSBRenc/src/sbr_def.h +++ b/libSBRenc/src/sbr_def.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------------------------------------- Software License for The Fraunhofer FDK AAC Codec Library for Android -© Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. +© Copyright 1995 - 2015 Fraunhofer-Gesellschaft zur Förderung der angewandten Forschung e.V. All rights reserved. 1. INTRODUCTION @@ -122,6 +122,8 @@ amm-info@iis.fraunhofer.de /************ Definitions ***************/ #define SBR_COMP_MODE_DELTA 0 #define SBR_COMP_MODE_CTS 1 +#define SBR_MAX_ENERGY_VALUES 5 +#define SBR_GLOBAL_TONALITY_VALUES 2 #define MAX_NUM_CHANNELS 2 @@ -232,6 +234,8 @@ amm-info@iis.fraunhofer.de #define FREQ 0 #define TIME 1 +/* qmf data scaling */ +#define QMF_SCALE_OFFSET 7 /* huffman tables */ #define CODE_BOOK_SCF_LAV00 60 @@ -268,12 +272,4 @@ typedef enum } INVF_MODE; -typedef enum -{ - FREQ_RES_LOW = 0, - FREQ_RES_HIGH -} -FREQ_RES; - - #endif |