Add expected const qualifier on 'buf' to match AVCodec.decode's declaration.

[ffmpeg] / libavcodec / aac.h

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 0a9cc81604176230832562a75ae0b96c10e44b7e..6022ca66be04f019c49fdf485aae38813b891da6 100644 (file)
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -46,7 +46,6 @@
 #define MAX_ELEM_ID 16
 
 #define TNS_MAX_ORDER 20
-#define PNS_MEAN_ENERGY 3719550720.0f // sqrt(3.0) * 1<<31
 
 enum AudioObjectType {
     AOT_NULL,
@@ -133,6 +132,20 @@ enum CouplingPoint {
     AFTER_IMDCT = 3,
 };
 
+/**
+ * Predictor State
+ */
+typedef struct {
+    float cor0;
+    float cor1;
+    float var0;
+    float var1;
+    float r0;
+    float r1;
+} PredictorState;
+
+#define MAX_PREDICTORS 672
+
 /**
  * Individual Channel Stream
  */
@@ -146,6 +159,11 @@ typedef struct {
     int num_swb;                ///< number of scalefactor window bands
     int num_windows;
     int tns_max_bands;
+    int predictor_present;
+    int predictor_initialized;
+    int predictor_reset_group;
+    uint8_t prediction_used[41];
+    PredictorState predictor_state[MAX_PREDICTORS];
 } IndividualChannelStream;
 
 /**
@@ -190,8 +208,8 @@ typedef struct {
     int num_coupled;       ///< number of target elements
     enum RawDataBlockType type[8];   ///< Type of channel element to be coupled - SCE or CPE.
     int id_select[8];      ///< element id
-    int ch_select[8];      /**< [0] shared list of gains; [1] list of gains for left channel;
-                            *   [2] list of gains for right channel; [3] lists of gains for both channels
+    int ch_select[8];      /**< [0] shared list of gains; [1] list of gains for right channel;
+                            *   [2] list of gains for left channel; [3] lists of gains for both channels
                             */
     float gain[16][120];
 } ChannelCoupling;