From 37d4ab77290e4b906df51a7012576e6aec0fc605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 31 May 2007 20:29:27 +0200 Subject: Move libfaad in contrib/ and contextually move the plugin in src/libxineadec/. --HG-- rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am rename : src/libfaad/analysis.h => contrib/libfaad/analysis.h rename : src/libfaad/bits.c => contrib/libfaad/bits.c rename : src/libfaad/bits.h => contrib/libfaad/bits.h rename : src/libfaad/cfft.c => contrib/libfaad/cfft.c rename : src/libfaad/cfft.h => contrib/libfaad/cfft.h rename : src/libfaad/cfft_tab.h => contrib/libfaad/cfft_tab.h rename : src/libfaad/codebook/Makefile.am => contrib/libfaad/codebook/Makefile.am rename : src/libfaad/codebook/hcb.h => contrib/libfaad/codebook/hcb.h rename : src/libfaad/codebook/hcb_1.h => contrib/libfaad/codebook/hcb_1.h rename : src/libfaad/codebook/hcb_10.h => contrib/libfaad/codebook/hcb_10.h rename : src/libfaad/codebook/hcb_11.h => contrib/libfaad/codebook/hcb_11.h rename : src/libfaad/codebook/hcb_2.h => contrib/libfaad/codebook/hcb_2.h rename : src/libfaad/codebook/hcb_3.h => contrib/libfaad/codebook/hcb_3.h rename : src/libfaad/codebook/hcb_4.h => contrib/libfaad/codebook/hcb_4.h rename : src/libfaad/codebook/hcb_5.h => contrib/libfaad/codebook/hcb_5.h rename : src/libfaad/codebook/hcb_6.h => contrib/libfaad/codebook/hcb_6.h rename : src/libfaad/codebook/hcb_7.h => contrib/libfaad/codebook/hcb_7.h rename : src/libfaad/codebook/hcb_8.h => contrib/libfaad/codebook/hcb_8.h rename : src/libfaad/codebook/hcb_9.h => contrib/libfaad/codebook/hcb_9.h rename : src/libfaad/codebook/hcb_sf.h => contrib/libfaad/codebook/hcb_sf.h rename : src/libfaad/common.c => contrib/libfaad/common.c rename : src/libfaad/common.h => contrib/libfaad/common.h rename : src/libfaad/decoder.c => contrib/libfaad/decoder.c rename : src/libfaad/decoder.h => contrib/libfaad/decoder.h rename : src/libfaad/diff_to_faad2_cvs.patch => contrib/libfaad/diff_to_faad2_cvs.patch rename : src/libfaad/drc.c => contrib/libfaad/drc.c rename : src/libfaad/drc.h => contrib/libfaad/drc.h rename : src/libfaad/drm_dec.c => contrib/libfaad/drm_dec.c rename : src/libfaad/drm_dec.h => contrib/libfaad/drm_dec.h rename : src/libfaad/error.c => contrib/libfaad/error.c rename : src/libfaad/error.h => contrib/libfaad/error.h rename : src/libfaad/faad.h => contrib/libfaad/faad.h rename : src/libfaad/filtbank.c => contrib/libfaad/filtbank.c rename : src/libfaad/filtbank.h => contrib/libfaad/filtbank.h rename : src/libfaad/fixed.h => contrib/libfaad/fixed.h rename : src/libfaad/hcr.c => contrib/libfaad/hcr.c rename : src/libfaad/huffman.c => contrib/libfaad/huffman.c rename : src/libfaad/huffman.h => contrib/libfaad/huffman.h rename : src/libfaad/ic_predict.c => contrib/libfaad/ic_predict.c rename : src/libfaad/ic_predict.h => contrib/libfaad/ic_predict.h rename : src/libfaad/iq_table.h => contrib/libfaad/iq_table.h rename : src/libfaad/is.c => contrib/libfaad/is.c rename : src/libfaad/is.h => contrib/libfaad/is.h rename : src/libfaad/kbd_win.h => contrib/libfaad/kbd_win.h rename : src/libfaad/lt_predict.c => contrib/libfaad/lt_predict.c rename : src/libfaad/lt_predict.h => contrib/libfaad/lt_predict.h rename : src/libfaad/mdct.c => contrib/libfaad/mdct.c rename : src/libfaad/mdct.h => contrib/libfaad/mdct.h rename : src/libfaad/mdct_tab.h => contrib/libfaad/mdct_tab.h rename : src/libfaad/mp4.c => contrib/libfaad/mp4.c rename : src/libfaad/mp4.h => contrib/libfaad/mp4.h rename : src/libfaad/ms.c => contrib/libfaad/ms.c rename : src/libfaad/ms.h => contrib/libfaad/ms.h rename : src/libfaad/output.c => contrib/libfaad/output.c rename : src/libfaad/output.h => contrib/libfaad/output.h rename : src/libfaad/pns.c => contrib/libfaad/pns.c rename : src/libfaad/pns.h => contrib/libfaad/pns.h rename : src/libfaad/ps_dec.c => contrib/libfaad/ps_dec.c rename : src/libfaad/ps_dec.h => contrib/libfaad/ps_dec.h rename : src/libfaad/ps_syntax.c => contrib/libfaad/ps_syntax.c rename : src/libfaad/ps_tables.h => contrib/libfaad/ps_tables.h rename : src/libfaad/pulse.c => contrib/libfaad/pulse.c rename : src/libfaad/pulse.h => contrib/libfaad/pulse.h rename : src/libfaad/rvlc.c => contrib/libfaad/rvlc.c rename : src/libfaad/rvlc.h => contrib/libfaad/rvlc.h rename : src/libfaad/sbr_dct.c => contrib/libfaad/sbr_dct.c rename : src/libfaad/sbr_dct.h => contrib/libfaad/sbr_dct.h rename : src/libfaad/sbr_dec.c => contrib/libfaad/sbr_dec.c rename : src/libfaad/sbr_dec.h => contrib/libfaad/sbr_dec.h rename : src/libfaad/sbr_e_nf.c => contrib/libfaad/sbr_e_nf.c rename : src/libfaad/sbr_e_nf.h => contrib/libfaad/sbr_e_nf.h rename : src/libfaad/sbr_fbt.c => contrib/libfaad/sbr_fbt.c rename : src/libfaad/sbr_fbt.h => contrib/libfaad/sbr_fbt.h rename : src/libfaad/sbr_hfadj.c => contrib/libfaad/sbr_hfadj.c rename : src/libfaad/sbr_hfadj.h => contrib/libfaad/sbr_hfadj.h rename : src/libfaad/sbr_hfgen.c => contrib/libfaad/sbr_hfgen.c rename : src/libfaad/sbr_hfgen.h => contrib/libfaad/sbr_hfgen.h rename : src/libfaad/sbr_huff.c => contrib/libfaad/sbr_huff.c rename : src/libfaad/sbr_huff.h => contrib/libfaad/sbr_huff.h rename : src/libfaad/sbr_noise.h => contrib/libfaad/sbr_noise.h rename : src/libfaad/sbr_qmf.c => contrib/libfaad/sbr_qmf.c rename : src/libfaad/sbr_qmf.h => contrib/libfaad/sbr_qmf.h rename : src/libfaad/sbr_qmf_c.h => contrib/libfaad/sbr_qmf_c.h rename : src/libfaad/sbr_syntax.c => contrib/libfaad/sbr_syntax.c rename : src/libfaad/sbr_syntax.h => contrib/libfaad/sbr_syntax.h rename : src/libfaad/sbr_tf_grid.c => contrib/libfaad/sbr_tf_grid.c rename : src/libfaad/sbr_tf_grid.h => contrib/libfaad/sbr_tf_grid.h rename : src/libfaad/sine_win.h => contrib/libfaad/sine_win.h rename : src/libfaad/specrec.c => contrib/libfaad/specrec.c rename : src/libfaad/specrec.h => contrib/libfaad/specrec.h rename : src/libfaad/ssr.c => contrib/libfaad/ssr.c rename : src/libfaad/ssr.h => contrib/libfaad/ssr.h rename : src/libfaad/ssr_fb.c => contrib/libfaad/ssr_fb.c rename : src/libfaad/ssr_fb.h => contrib/libfaad/ssr_fb.h rename : src/libfaad/ssr_ipqf.c => contrib/libfaad/ssr_ipqf.c rename : src/libfaad/ssr_ipqf.h => contrib/libfaad/ssr_ipqf.h rename : src/libfaad/ssr_win.h => contrib/libfaad/ssr_win.h rename : src/libfaad/structs.h => contrib/libfaad/structs.h rename : src/libfaad/syntax.c => contrib/libfaad/syntax.c rename : src/libfaad/syntax.h => contrib/libfaad/syntax.h rename : src/libfaad/tns.c => contrib/libfaad/tns.c rename : src/libfaad/tns.h => contrib/libfaad/tns.h rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c --- src/libfaad/ssr.c | 172 ------------------------------------------------------ 1 file changed, 172 deletions(-) delete mode 100644 src/libfaad/ssr.c (limited to 'src/libfaad/ssr.c') diff --git a/src/libfaad/ssr.c b/src/libfaad/ssr.c deleted file mode 100644 index 46517d0c8..000000000 --- a/src/libfaad/ssr.c +++ /dev/null @@ -1,172 +0,0 @@ -/* -** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** 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 -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -** -** Any non-GPL usage of this software or parts of this software is strictly -** forbidden. -** -** Commercial non-GPL licensing of this software is possible. -** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -** -** $Id: ssr.c,v 1.6 2005/10/29 23:57:07 tmmm Exp $ -**/ - -#include "common.h" -#include "structs.h" - -#ifdef SSR_DEC - -#include "syntax.h" -#include "filtbank.h" -#include "ssr.h" -#include "ssr_fb.h" - -void ssr_decode(ssr_info *ssr, fb_info *fb, uint8_t window_sequence, - uint8_t window_shape, uint8_t window_shape_prev, - real_t *freq_in, real_t *time_out, real_t *overlap, - real_t ipqf_buffer[SSR_BANDS][96/4], - real_t *prev_fmd, uint16_t frame_len) -{ - uint8_t band; - uint16_t ssr_frame_len = frame_len/SSR_BANDS; - real_t time_tmp[2048] = {0}; - real_t output[1024] = {0}; - - for (band = 0; band < SSR_BANDS; band++) - { - int16_t j; - - /* uneven bands have inverted frequency scale */ - if (band == 1 || band == 3) - { - for (j = 0; j < ssr_frame_len/2; j++) - { - real_t tmp; - tmp = freq_in[j + ssr_frame_len*band]; - freq_in[j + ssr_frame_len*band] = - freq_in[ssr_frame_len - j - 1 + ssr_frame_len*band]; - freq_in[ssr_frame_len - j - 1 + ssr_frame_len*band] = tmp; - } - } - - /* non-overlapping inverse filterbank for SSR */ - ssr_ifilter_bank(fb, window_sequence, window_shape, window_shape_prev, - freq_in + band*ssr_frame_len, time_tmp + band*ssr_frame_len, - ssr_frame_len); - - /* gain control */ - ssr_gain_control(ssr, time_tmp, output, overlap, prev_fmd, - band, window_sequence, ssr_frame_len); - } - - /* inverse pqf to bring subbands together again */ - ssr_ipqf(ssr, output, time_out, ipqf_buffer, frame_len, SSR_BANDS); -} - -static void ssr_gain_control(ssr_info *ssr, real_t *data, real_t *output, - real_t *overlap, real_t *prev_fmd, uint8_t band, - uint8_t window_sequence, uint16_t frame_len) -{ - uint16_t i; - real_t gc_function[2*1024/SSR_BANDS]; - - if (window_sequence != EIGHT_SHORT_SEQUENCE) - { - ssr_gc_function(ssr, &prev_fmd[band * frame_len*2], - gc_function, window_sequence, band, frame_len); - - for (i = 0; i < frame_len*2; i++) - data[band * frame_len*2 + i] *= gc_function[i]; - for (i = 0; i < frame_len; i++) - { - output[band*frame_len + i] = overlap[band*frame_len + i] + - data[band*frame_len*2 + i]; - } - for (i = 0; i < frame_len; i++) - { - overlap[band*frame_len + i] = - data[band*frame_len*2 + frame_len + i]; - } - } else { - uint8_t w; - for (w = 0; w < 8; w++) - { - uint16_t frame_len8 = frame_len/8; - uint16_t frame_len16 = frame_len/16; - - ssr_gc_function(ssr, &prev_fmd[band*frame_len*2 + w*frame_len*2/8], - gc_function, window_sequence, frame_len); - - for (i = 0; i < frame_len8*2; i++) - data[band*frame_len*2 + w*frame_len8*2+i] *= gc_function[i]; - for (i = 0; i < frame_len8; i++) - { - overlap[band*frame_len + i + 7*frame_len16 + w*frame_len8] += - data[band*frame_len*2 + 2*w*frame_len8 + i]; - } - for (i = 0; i < frame_len8; i++) - { - overlap[band*frame_len + i + 7*frame_len16 + (w+1)*frame_len8] = - data[band*frame_len*2 + 2*w*frame_len8 + frame_len8 + i]; - } - } - for (i = 0; i < frame_len; i++) - output[band*frame_len + i] = overlap[band*frame_len + i]; - for (i = 0; i < frame_len; i++) - overlap[band*frame_len + i] = overlap[band*frame_len + i + frame_len]; - } -} - -static void ssr_gc_function(ssr_info *ssr, real_t *prev_fmd, - real_t *gc_function, uint8_t window_sequence, - uint8_t band, uint16_t frame_len) -{ - uint16_t i; - uint16_t len_area1, len_area2; - int32_t aloc[10]; - real_t alev[10]; - - switch (window_sequence) - { - case ONLY_LONG_SEQUENCE: - len_area1 = frame_len/SSR_BANDS; - len_area2 = 0; - break; - case LONG_START_SEQUENCE: - len_area1 = (frame_len/SSR_BANDS)*7/32; - len_area2 = (frame_len/SSR_BANDS)/16; - break; - case EIGHT_SHORT_SEQUENCE: - len_area1 = (frame_len/8)/SSR_BANDS; - len_area2 = 0; - break; - case LONG_STOP_SEQUENCE: - len_area1 = (frame_len/SSR_BANDS); - len_area2 = 0; - break; - } - - /* decode bitstream information */ - - /* build array M */ - - - for (i = 0; i < frame_len*2; i++) - gc_function[i] = 1; -} - -#endif -- cgit v1.2.3