[FFmpeg-soc] [soc]: r5506 - in aac-sbr: aacsbr.c aacsbr.h

alexc subversion at mplayerhq.hu
Mon Dec 7 18:16:42 CET 2009


Author: alexc
Date: Mon Dec  7 18:16:41 2009
New Revision: 5506

Log:
Resize x_high to 64x40x2.

Modified:
   aac-sbr/aacsbr.c
   aac-sbr/aacsbr.h

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Mon Dec  7 18:16:38 2009	(r5505)
+++ aac-sbr/aacsbr.c	Mon Dec  7 18:16:41 2009	(r5506)
@@ -1229,7 +1229,7 @@ static int sbr_lf_gen(AACContext *ac, Sp
 
 // High Frequency Generator (14496-3 sp04 p215)
 static int sbr_hf_gen(AACContext *ac, SpectralBandReplication *sbr,
-                      float x_high[32][40][2], float x_low[32][40][2], float (*alpha0)[2],
+                      float x_high[64][40][2], float x_low[32][40][2], float (*alpha0)[2],
                       float (*alpha1)[2], float bw_array[2][5], uint8_t *t_env,
                       int bs_num_env)
 {
@@ -1364,7 +1364,7 @@ static void sbr_mapping(AACContext *ac, 
 }
 
 // Estimation of current envelope (14496-3 sp04 p218)
-static void sbr_env_estimate(float (*e_curr)[48], float x_high[32][40][2],
+static void sbr_env_estimate(float (*e_curr)[48], float x_high[64][40][2],
                              SpectralBandReplication *sbr, SBRData *ch_data,
                              int ch)
 {
@@ -1509,7 +1509,7 @@ static void sbr_gain_calc(AACContext * a
 }
 
 // Assembling HF Signals (14496-3 sp04 p220)
-static void sbr_hf_assemble(float y[2][64][40][2], float x_high[32][40][2],
+static void sbr_hf_assemble(float y[2][64][40][2], float x_high[64][40][2],
                             SpectralBandReplication *sbr, SBRData *ch_data,
                             int ch, int l_a[2])
 {

Modified: aac-sbr/aacsbr.h
==============================================================================
--- aac-sbr/aacsbr.h	Mon Dec  7 18:16:38 2009	(r5505)
+++ aac-sbr/aacsbr.h	Mon Dec  7 18:16:41 2009	(r5506)
@@ -147,7 +147,7 @@ typedef struct {
     float              noise_facs[2][2][5];
     float              W[2][32][32][2];
     float              x_low[32][40][2];
-    float              x_high[32][40][2];
+    float              x_high[64][40][2];
     float              y[2][64][40][2];
     float              X[64][40][2];
     float              alpha0[64][2];


More information about the FFmpeg-soc mailing list