← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ffmpeg-debian/utopic

« back to all changes in this revision

Viewing changes to libavcodec/aac.h

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-01-20 09:20:53 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090120092053-izz63p40hc98qfgp
Tags: 3:0.svn20090119-1ubuntu1
https://launchpad.net/bugs/318501
https://launchpad.net/bugs/253767
* merge from debian. LP: #318501
* new version fixes CVE-2008-3230, LP: #253767

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/aac.h
133
133
};
134
134
 
135
135
/**
 
136
 * Predictor State
 
137
 */
 
138
typedef struct {
 
139
    float cor0;
 
140
    float cor1;
 
141
    float var0;
 
142
    float var1;
 
143
    float r0;
 
144
    float r1;
 
145
} PredictorState;
 
146
 
 
147
#define MAX_PREDICTORS 672
 
148
 
 
149
/**
136
150
 * Individual Channel Stream
137
151
 */
138
152
typedef struct {
145
159
    int num_swb;                ///< number of scalefactor window bands
146
160
    int num_windows;
147
161
    int tns_max_bands;
 
162
    int predictor_present;
 
163
    int predictor_initialized;
 
164
    int predictor_reset_group;
 
165
    uint8_t prediction_used[41];
148
166
} IndividualChannelStream;
149
167
 
150
168
/**
207
225
    DECLARE_ALIGNED_16(float, coeffs[1024]);  ///< coefficients for IMDCT
208
226
    DECLARE_ALIGNED_16(float, saved[512]);    ///< overlap
209
227
    DECLARE_ALIGNED_16(float, ret[1024]);     ///< PCM output
 
228
    PredictorState predictor_state[MAX_PREDICTORS];
210
229
} SingleChannelElement;
211
230
 
212
231
/**
269
288
    int sf_offset;                                    ///< offset into pow2sf_tab as appropriate for dsp.float_to_int16
270
289
    /** @} */
271
290
 
 
291
    DECLARE_ALIGNED(16, float, temp[128]);
272
292
} AACContext;
273
293
 
274
294
#endif /* AVCODEC_AAC_H */