Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / sbr.h

diff --git a/libavcodec/sbr.h b/libavcodec/sbr.h
index 10a5e4f72b54d16fb8bc33ccc2f56c9ba6d9d142..82a996fdc6ba7645d1a83cefef4adeef0e67cad2 100644 (file)
--- a/libavcodec/sbr.h
+++ b/libavcodec/sbr.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * @file libavcodec/sbr.h
+ * @file
  * Spectral Band Replication definitions and structures
  * @author Robert Swain ( rob opendot cl )
  */
@@ -31,6 +31,7 @@
 
 #include <stdint.h>
 #include "fft.h"
+#include "aacps.h"
 
 /**
  * Spectral Band Replication header - spectrum parameters that invoke a reset if they differ from the previous header.
@@ -57,7 +58,7 @@ typedef struct {
  */
 typedef struct {
     /**
-     * @defgroup bitstream     Main bitstream data variables
+     * @defgroup aac_bitstream     Main bitstream data variables
      * @{
      */
     unsigned           bs_frame_class;
@@ -133,6 +134,7 @@ typedef struct {
     ///The number of frequency bands in f_master
     unsigned           n_master;
     SBRData            data[2];
+    PSContext          ps;
     ///N_Low and N_High respectively, the number of frequency bands for low and high resolution
     unsigned           n[2];
     ///Number of noise floor bands
@@ -157,7 +159,7 @@ typedef struct {
     ///QMF output of the HF generator
     float              X_high[64][40][2];
     ///QMF values of the reconstructed signal
-    DECLARE_ALIGNED(16, float, X)[2][32][64];
+    DECLARE_ALIGNED(16, float, X)[2][2][38][64];
     ///Zeroth coefficient used to filter the subband signals
     float              alpha0[64][2];
     ///First coefficient used to filter the subband signals
@@ -176,7 +178,7 @@ typedef struct {
     float              s_m[7][48];
     float              gain[7][48];
     DECLARE_ALIGNED(16, float, qmf_filter_scratch)[5][64];
-    RDFTContext        rdft;
+    FFTContext         mdct_ana;
     FFTContext         mdct;
 } SpectralBandReplication;