Mercurial > mplayer.hg
diff libfaad2/sbr_hfadj.h @ 12527:4a370c80fe5c
update to the 2.0 release of faad, patch by adland
author | diego |
---|---|
date | Wed, 02 Jun 2004 22:59:04 +0000 |
parents | 3185f64f6350 |
children | d81145997036 |
line wrap: on
line diff
--- a/libfaad2/sbr_hfadj.h Wed Jun 02 22:52:00 2004 +0000 +++ b/libfaad2/sbr_hfadj.h Wed Jun 02 22:59:04 2004 +0000 @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: sbr_hfadj.h,v 1.2 2003/09/09 18:09:52 menno Exp $ +** $Id: sbr_hfadj.h,v 1.2 2003/10/03 22:22:27 alex Exp $ **/ #ifndef __SBR_HFADJ_H__ @@ -46,27 +46,13 @@ } sbr_hfadj_info; -void hf_adjustment(sbr_info *sbr, qmf_t *Xsbr +void hf_adjustment(sbr_info *sbr, qmf_t Xsbr[MAX_NTSRHFG][64] #ifdef SBR_LOW_POWER ,real_t *deg #endif ,uint8_t ch); -static void map_envelope_data(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch); -static void map_noise_data(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch); -static void map_sinusoids(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch); -static void estimate_current_envelope(sbr_info *sbr, sbr_hfadj_info *adj, qmf_t *Xsbr, - uint8_t ch); -static void additional_component_levels(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch); -static void calculate_gain(sbr_info *sbr, sbr_hfadj_info *adj, uint8_t ch); -#ifdef SBR_LOW_POWER -static void calc_gain_groups(sbr_info *sbr, sbr_hfadj_info *adj, real_t *deg, uint8_t ch); -static void aliasing_reduction(sbr_info *sbr, sbr_hfadj_info *adj, real_t *deg, uint8_t ch); -#endif -static void hf_assembly(sbr_info *sbr, sbr_hfadj_info *adj, qmf_t *Xsbr, uint8_t ch); - - #ifdef __cplusplus } #endif