summaryrefslogtreecommitdiffstats
path: root/libAACenc/src/adj_thr.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-08-28 17:54:51 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2013-08-28 18:06:47 -0700
commit7ad97579f8ccb843afdb5b184c4b209253839fe3 (patch)
treee5777dc9d28b9038052ea4035ae9a072e1b852e0 /libAACenc/src/adj_thr.h
parent206a397c708738c08edc0229881018edcb8ea793 (diff)
downloadODR-AudioEnc-7ad97579f8ccb843afdb5b184c4b209253839fe3.tar.gz
ODR-AudioEnc-7ad97579f8ccb843afdb5b184c4b209253839fe3.tar.bz2
ODR-AudioEnc-7ad97579f8ccb843afdb5b184c4b209253839fe3.zip
AAC Encoder low delay quality
* AAC-Encoder - Revise bit distribution for lowdelay configuration to improve encoder audio quality. - Adjust lowdelay bitreservoir for low bitreservoir configuration. Modified file(s): libAACenc\src\aacEnc_ram.cpp libAACenc\src\aacenc.cpp libAACenc\src\aacenc_lib.cpp libAACenc\src\aacenc_tns.cpp libAACenc\src\adj_thr.cpp libAACenc\src\adj_thr.h libAACenc\src\block_switch.cpp libAACenc\src\block_switch.h libAACenc\src\interface.h libAACenc\src\psy_main.cpp libAACenc\src\qc_data.h libAACenc\src\qc_main.cpp * FDK-Library - Increase the accuracy in CalcInvLdData() calculation which improves the encoder audio quality. Modified file(s): libFDK\src\fixpoint_math.cpp Bug 9428126 Change-Id: I302d7f4c3aeccf79e1b85f20e18a31e6e2b10544
Diffstat (limited to 'libAACenc/src/adj_thr.h')
-rw-r--r--libAACenc/src/adj_thr.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/libAACenc/src/adj_thr.h b/libAACenc/src/adj_thr.h
index d03375c..a429dff 100644
--- a/libAACenc/src/adj_thr.h
+++ b/libAACenc/src/adj_thr.h
@@ -98,13 +98,14 @@ amm-info@iis.fraunhofer.de
#include "interface.h"
-
-void FDKaacEnc_peCalculation(PE_DATA *peData,
- PSY_OUT_CHANNEL* psyOutChannel[(2)],
- QC_OUT_CHANNEL* qcOutChannel[(2)],
- struct TOOLSINFO *toolsInfo,
- ATS_ELEMENT* adjThrStateElement,
- const INT nChannels);
+void FDKaacEnc_peCalculation(
+ PE_DATA *peData,
+ PSY_OUT_CHANNEL* psyOutChannel[(2)],
+ QC_OUT_CHANNEL* qcOutChannel[(2)],
+ struct TOOLSINFO *toolsInfo,
+ ATS_ELEMENT* adjThrStateElement,
+ const INT nChannels
+ );
INT FDKaacEnc_AdjThrNew(ADJ_THR_STATE** phAdjThr,
INT nElements);
@@ -112,9 +113,13 @@ INT FDKaacEnc_AdjThrNew(ADJ_THR_STATE** phAdjThr,
void FDKaacEnc_AdjThrInit(ADJ_THR_STATE *hAdjThr,
const INT peMean,
ELEMENT_BITS* elBits[(6)],
+ INT invQuant,
INT nElements,
+ INT nChannelsEff,
+ INT sampleRate,
+ INT advancedBitsToPe,
FIXP_DBL vbrQualFactor);
-
+
void FDKaacEnc_DistributeBits(ADJ_THR_STATE *adjThrState,
ATS_ELEMENT *AdjThrStateElement,
@@ -128,7 +133,7 @@ void FDKaacEnc_DistributeBits(ADJ_THR_STATE *adjThrState,
const INT bitresBits,
const INT maxBitresBits,
const FIXP_DBL maxBitFac,
- const INT bitDistributenMode);
+ const INT bitDistributionMode);
void FDKaacEnc_AdjustThresholds(ATS_ELEMENT* AdjThrStateElement[(6)],
QC_OUT_ELEMENT* qcElement[(6)],