summaryrefslogtreecommitdiffstats
path: root/libSBRenc/src/sbrenc_freq_sca.h
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2013-08-29 12:24:04 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2013-08-29 12:24:04 -0700
commit3aec97e388e29a1d03f0197b27b893bc6aaf8ac3 (patch)
tree0cbc01e83d71aec25704fd9a6dd80b339d06c27a /libSBRenc/src/sbrenc_freq_sca.h
parent7ad97579f8ccb843afdb5b184c4b209253839fe3 (diff)
downloadODR-AudioEnc-3aec97e388e29a1d03f0197b27b893bc6aaf8ac3.tar.gz
ODR-AudioEnc-3aec97e388e29a1d03f0197b27b893bc6aaf8ac3.tar.bz2
ODR-AudioEnc-3aec97e388e29a1d03f0197b27b893bc6aaf8ac3.zip
Encoder downsampled SBR
* AAC-Encoder - Introduce optional AACENC_SBR_RATIO encoder API parameter to configure dualrate or downsampled SBR explicitely. ELD makes use of downsampled SBR in default configuration. Modified file(s): documentation\aacEncoder.pdf libAACenc\include\aacenc_lib.h libAACenc\src\aacenc.h libAACenc\src\aacenc_lib.cpp * SBR-Encoder - Implement downsampled SBR feature. - Revise sbr tuning parameter selection. Modified file(s): libSBRenc\include\sbr_encoder.h libSBRenc\src\bit_sbr.h libSBRenc\src\env_est.cpp libSBRenc\src\mh_det.cpp libSBRenc\src\nf_est.cpp libSBRenc\src\ps_main.cpp libSBRenc\src\sbr.h libSBRenc\src\sbr_def.h libSBRenc\src\sbr_encoder.cpp libSBRenc\src\sbr_rom.cpp libSBRenc\src\sbr_rom.h libSBRenc\src\sbrenc_freq_sca.cpp libSBRenc\src\sbrenc_freq_sca.h libSBRenc\src\ton_corr.cpp Bug 9428126 Change-Id: I731720a10829272acaaf70b84525df00a09ff3d2
Diffstat (limited to 'libSBRenc/src/sbrenc_freq_sca.h')
-rw-r--r--libSBRenc/src/sbrenc_freq_sca.h60
1 files changed, 34 insertions, 26 deletions
diff --git a/libSBRenc/src/sbrenc_freq_sca.h b/libSBRenc/src/sbrenc_freq_sca.h
index 51ed688..6f2bb84 100644
--- a/libSBRenc/src/sbrenc_freq_sca.h
+++ b/libSBRenc/src/sbrenc_freq_sca.h
@@ -96,34 +96,42 @@ amm-info@iis.fraunhofer.de
INT
-FDKsbrEnc_UpdateFreqScale(UCHAR *v_k_master, INT *h_num_bands,
- const INT k0, const INT k2,
- const INT freq_scale,
- const INT alter_scale);
+FDKsbrEnc_UpdateFreqScale(
+ UCHAR *v_k_master,
+ INT *h_num_bands,
+ const INT k0,
+ const INT k2,
+ const INT freq_scale,
+ const INT alter_scale
+ );
INT
-FDKsbrEnc_UpdateHiRes(UCHAR *h_hires,
- INT *num_hires,
- UCHAR *v_k_master,
- INT num_master ,
- INT *xover_band,
- SR_MODE drOrSr,
- INT noQMFChannels);
-
-void FDKsbrEnc_UpdateLoRes(UCHAR * v_lores,
- INT *num_lores,
- UCHAR * v_hires,
- INT num_hires);
+FDKsbrEnc_UpdateHiRes(
+ UCHAR *h_hires,
+ INT *num_hires,
+ UCHAR *v_k_master,
+ INT num_master,
+ INT *xover_band
+ );
+
+void FDKsbrEnc_UpdateLoRes(
+ UCHAR *v_lores,
+ INT *num_lores,
+ UCHAR *v_hires,
+ INT num_hires
+ );
INT
-FDKsbrEnc_FindStartAndStopBand(const INT samplingFreq,
- const INT noChannels,
- const INT startFreq,
- const INT stop_freq,
- const SR_MODE sampleRateMode,
- INT *k0,
- INT *k2);
-
-INT FDKsbrEnc_getSbrStartFreqRAW (INT startFreq, INT QMFbands, INT fs );
-INT FDKsbrEnc_getSbrStopFreqRAW (INT stopFreq, INT QMFbands, INT fs);
+FDKsbrEnc_FindStartAndStopBand(
+ const INT srSbr,
+ const INT srCore,
+ const INT noChannels,
+ const INT startFreq,
+ const INT stop_freq,
+ INT *k0,
+ INT *k2
+ );
+
+INT FDKsbrEnc_getSbrStartFreqRAW (INT startFreq, INT fsCore);
+INT FDKsbrEnc_getSbrStopFreqRAW (INT stopFreq, INT fsCore);
#endif