diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-07-08 20:01:31 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-07-08 20:01:31 +0000 |
| commit | 78e65cd7726942a1615ead039abe0bfa79341212 (patch) | |
| tree | 7003e32f0234d3fb6d7959e9f193e2ec733df5c6 /libavcodec/aac.h | |
| parent | 5e039e1b4c0fe25c76faa7ea107db60264edb757 (diff) | |
| download | ffmpeg-78e65cd7726942a1615ead039abe0bfa79341212.tar.gz | |
Merge the AAC encoder from SoC svn. It is still considered experimental.
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 95adcb3922..1d24a59667 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -116,6 +116,12 @@ typedef struct { #define MAX_PREDICTORS 672 +#define SCALE_DIV_512 36 ///< scalefactor difference that corresponds to scale difference in 512 times +#define SCALE_ONE_POS 140 ///< scalefactor index that corresponds to scale=1.0 +#define SCALE_MAX_POS 255 ///< scalefactor index maximum value +#define SCALE_MAX_DIFF 60 ///< maximum scalefactor difference allowed by standard +#define SCALE_DIFF_ZERO 60 ///< codebook index corresponding to zero scalefactor indices difference + /** * Individual Channel Stream */ @@ -126,6 +132,7 @@ typedef struct { int num_window_groups; uint8_t group_len[8]; const uint16_t *swb_offset; ///< table of offsets to the lowest spectral coefficient of a scalefactor band, sfb, for a particular window + const uint8_t *swb_sizes; ///< table of scalefactor band sizes for a particular window int num_swb; ///< number of scalefactor window bands int num_windows; int tns_max_bands; @@ -165,6 +172,7 @@ typedef struct { typedef struct { int num_pulse; + int start; int pos[4]; int amp[4]; } Pulse; @@ -189,11 +197,14 @@ typedef struct { typedef struct { IndividualChannelStream ics; TemporalNoiseShaping tns; - enum BandType band_type[120]; ///< band types + Pulse pulse; + enum BandType band_type[128]; ///< band types int band_type_run_end[120]; ///< band type run end points float sf[120]; ///< scalefactors + int sf_idx[128]; ///< scalefactor indices (used by encoder) + uint8_t zeroes[128]; ///< band is not coded (used by encoder) DECLARE_ALIGNED_16(float, coeffs[1024]); ///< coefficients for IMDCT - DECLARE_ALIGNED_16(float, saved[512]); ///< overlap + DECLARE_ALIGNED_16(float, saved[1024]); ///< overlap DECLARE_ALIGNED_16(float, ret[1024]); ///< PCM output PredictorState predictor_state[MAX_PREDICTORS]; } SingleChannelElement; @@ -203,7 +214,9 @@ typedef struct { */ typedef struct { // CPE specific - uint8_t ms_mask[120]; ///< Set if mid/side stereo is used for each scalefactor window band + int common_window; ///< Set if channels share a common 'IndividualChannelStream' in bitstream. + int ms_mode; ///< Signals mid/side stereo flags coding mode (used by encoder) + uint8_t ms_mask[128]; ///< Set if mid/side stereo is used for each scalefactor window band // shared SingleChannelElement ch[2]; // CCE specific |