mplayer.hg: libfaad2/filtbank.c comparison

comparison libfaad2/filtbank.c @ 13453:6d50ef45a058

Update FAAD to a 2.1 beta CVS snapshot from 2004.07.12. patch by adland <adland123 at yahoo dot com>

author	diego
date	Fri, 24 Sep 2004 17:31:36 +0000
parents	d81145997036
children	2ae5ab4331ca

comparison

equal deleted inserted replaced

-:c364b7c13dd8
+:6d50ef45a058
 **
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
 ** Initially modified for use with MPlayer by Arpad Gereöffy on 2003/08/30
-** $Id: filtbank.c,v 1.3 2004/06/02 22:59:02 diego Exp $
+** $Id: filtbank.c,v 1.4 2004/06/23 13:50:49 diego Exp $
 ** detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
 **/
 #include "common.h"
 #include "structs.h"
 #ifdef PROFILE
 int64_t count = faad_get_ts();
 #endif
+/* select windows of current frame and previous frame (Sine or KBD) */
 #ifdef LD_DEC
 if (object_type == LD)
 {
 window_long       = fb->ld_window[window_shape];
 window_long_prev  = fb->ld_window[window_shape_prev];
 window_short_prev = fb->short_window[window_shape_prev];
 #ifdef LD_DEC
 }
 #endif
+#if 0
+for (i = 0; i < 1024; i++)
+{
+printf("%d\n", freq_in[i]);
+}
+#endif
+#if 0
+printf("%d %d\n", window_sequence, window_shape);
+#endif
 switch (window_sequence)
 {
 case ONLY_LONG_SEQUENCE:
+/* perform iMDCT */
 imdct_long(fb, freq_in, transf_buf, 2*nlong);
+/* add second half output of previous frame to windowed output of current frame */
 for (i = 0; i < nlong; i+=4)
 {
 time_out[i]   = overlap[i]   + MUL_F(transf_buf[i],window_long_prev[i]);
 time_out[i+1] = overlap[i+1] + MUL_F(transf_buf[i+1],window_long_prev[i+1]);
 time_out[i+2] = overlap[i+2] + MUL_F(transf_buf[i+2],window_long_prev[i+2]);
 time_out[i+3] = overlap[i+3] + MUL_F(transf_buf[i+3],window_long_prev[i+3]);
 }
+/* window the second half and save as overlap for next frame */
 for (i = 0; i < nlong; i+=4)
 {
 overlap[i]   = MUL_F(transf_buf[nlong+i],window_long[nlong-1-i]);
 overlap[i+1] = MUL_F(transf_buf[nlong+i+1],window_long[nlong-2-i]);
 overlap[i+2] = MUL_F(transf_buf[nlong+i+2],window_long[nlong-3-i]);
 overlap[i+3] = MUL_F(transf_buf[nlong+i+3],window_long[nlong-4-i]);
 }
 break;
 case LONG_START_SEQUENCE:
+/* perform iMDCT */
 imdct_long(fb, freq_in, transf_buf, 2*nlong);
+/* add second half output of previous frame to windowed output of current frame */
 for (i = 0; i < nlong; i+=4)
 {
 time_out[i]   = overlap[i]   + MUL_F(transf_buf[i],window_long_prev[i]);
 time_out[i+1] = overlap[i+1] + MUL_F(transf_buf[i+1],window_long_prev[i+1]);
 time_out[i+2] = overlap[i+2] + MUL_F(transf_buf[i+2],window_long_prev[i+2]);
 time_out[i+3] = overlap[i+3] + MUL_F(transf_buf[i+3],window_long_prev[i+3]);
 }
+/* window the second half and save as overlap for next frame */
+/* construct second half window using padding with 1's and 0's */
 for (i = 0; i < nflat_ls; i++)
 overlap[i] = transf_buf[nlong+i];
 for (i = 0; i < nshort; i++)
 overlap[nflat_ls+i] = MUL_F(transf_buf[nlong+nflat_ls+i],window_short[nshort-i-1]);
 for (i = 0; i < nflat_ls; i++)
 overlap[nflat_ls+nshort+i] = 0;
 break;
 case EIGHT_SHORT_SEQUENCE:
+/* perform iMDCT for each short block */
 faad_imdct(fb->mdct256, freq_in+0*nshort, transf_buf+2*nshort*0);
 faad_imdct(fb->mdct256, freq_in+1*nshort, transf_buf+2*nshort*1);
 faad_imdct(fb->mdct256, freq_in+2*nshort, transf_buf+2*nshort*2);
 faad_imdct(fb->mdct256, freq_in+3*nshort, transf_buf+2*nshort*3);
 faad_imdct(fb->mdct256, freq_in+4*nshort, transf_buf+2*nshort*4);
 faad_imdct(fb->mdct256, freq_in+5*nshort, transf_buf+2*nshort*5);
 faad_imdct(fb->mdct256, freq_in+6*nshort, transf_buf+2*nshort*6);
 faad_imdct(fb->mdct256, freq_in+7*nshort, transf_buf+2*nshort*7);
+/* add second half output of previous frame to windowed output of current frame */
 for (i = 0; i < nflat_ls; i++)
 time_out[i] = overlap[i];
 for(i = 0; i < nshort; i++)
 {
 time_out[nflat_ls+         i] = overlap[nflat_ls+         i] + MUL_F(transf_buf[nshort*0+i],window_short_prev[i]);
 time_out[nflat_ls+2*nshort+i] = overlap[nflat_ls+nshort*2+i] + MUL_F(transf_buf[nshort*3+i],window_short[nshort-1-i]) + MUL_F(transf_buf[nshort*4+i],window_short[i]);
 time_out[nflat_ls+3*nshort+i] = overlap[nflat_ls+nshort*3+i] + MUL_F(transf_buf[nshort*5+i],window_short[nshort-1-i]) + MUL_F(transf_buf[nshort*6+i],window_short[i]);
 if (i < trans)
 time_out[nflat_ls+4*nshort+i] = overlap[nflat_ls+nshort*4+i] + MUL_F(transf_buf[nshort*7+i],window_short[nshort-1-i]) + MUL_F(transf_buf[nshort*8+i],window_short[i]);
 }
+/* window the second half and save as overlap for next frame */
 for(i = 0; i < nshort; i++)
 {
 if (i >= trans)
 overlap[nflat_ls+4*nshort+i-nlong] = MUL_F(transf_buf[nshort*7+i],window_short[nshort-1-i]) + MUL_F(transf_buf[nshort*8+i],window_short[i]);
 overlap[nflat_ls+5*nshort+i-nlong] = MUL_F(transf_buf[nshort*9+i],window_short[nshort-1-i]) + MUL_F(transf_buf[nshort*10+i],window_short[i]);
 for (i = 0; i < nflat_ls; i++)
 overlap[nflat_ls+nshort+i] = 0;
 break;
 case LONG_STOP_SEQUENCE:
+/* perform iMDCT */
 imdct_long(fb, freq_in, transf_buf, 2*nlong);
+/* add second half output of previous frame to windowed output of current frame */
+/* construct first half window using padding with 1's and 0's */
 for (i = 0; i < nflat_ls; i++)
 time_out[i] = overlap[i];
 for (i = 0; i < nshort; i++)
 time_out[nflat_ls+i] = overlap[nflat_ls+i] + MUL_F(transf_buf[nflat_ls+i],window_short_prev[i]);
 for (i = 0; i < nflat_ls; i++)
 time_out[nflat_ls+nshort+i] = overlap[nflat_ls+nshort+i] + transf_buf[nflat_ls+nshort+i];
+/* window the second half and save as overlap for next frame */
 for (i = 0; i < nlong; i++)
 overlap[i] = MUL_F(transf_buf[nlong+i],window_long[nlong-1-i]);
 		break;
 }
+#if 0
+for (i = 0; i < 1024; i++)
+{
+//printf("%d\n", time_out[i]);
+printf("0x%.8X\n", time_out[i]);
+}
+#endif
 #ifdef PROFILE
 count = faad_get_ts() - count;
 fb->cycles += count;
 #endif

Mercurial > mplayer.hg

comparison libfaad2/filtbank.c @ 13453:6d50ef45a058