#ifndef AVCODEC_AACENC_H
#define AVCODEC_AACENC_H
+#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "put_bits.h"
-#include "dsputil.h"
#include "aac.h"
-
+#include "audio_frame_queue.h"
#include "psymodel.h"
typedef struct AACEncOptions {
void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda);
} AACCoefficientsEncoder;
-extern AACCoefficientsEncoder ff_aac_coders[];
+extern const AACCoefficientsEncoder ff_aac_coders[];
/**
* AAC encoder context
PutBitContext pb;
FFTContext mdct1024; ///< long (1024 samples) frame transform context
FFTContext mdct128; ///< short (128 samples) frame transform context
- DSPContext dsp;
+ AVFloatDSPContext fdsp;
float *planar_samples[6]; ///< saved preprocessed input
int samplerate_index; ///< MPEG-4 samplerate index
ChannelElement *cpe; ///< channel elements
FFPsyContext psy;
struct FFPsyPreprocessContext* psypp;
- AACCoefficientsEncoder *coder;
+ const AACCoefficientsEncoder *coder;
int cur_channel;
int last_frame;
float lambda;
+ AudioFrameQueue afq;
DECLARE_ALIGNED(16, int, qcoefs)[96]; ///< quantized coefficients
DECLARE_ALIGNED(32, float, scoefs)[1024]; ///< scaled coefficients