*/
#define CONFIG_AC3ENC_FLOAT 1
-#include "ac3enc.c"
+#include "internal.h"
+#include "audiodsp.h"
+#include "ac3enc.h"
+#include "eac3enc.h"
+#include "kbdwin.h"
-/**
- * Finalize MDCT and free allocated memory.
+#define AC3ENC_TYPE AC3ENC_TYPE_AC3
+#include "ac3enc_opts_template.c"
+
+static const AVClass ac3enc_class = {
+ .class_name = "AC-3 Encoder",
+ .item_name = av_default_item_name,
+ .option = ac3_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+
+/*
+ * Scale MDCT coefficients from float to 24-bit fixed-point.
*/
-static av_cold void mdct_end(AC3MDCTContext *mdct)
+static void scale_coefficients(AC3EncodeContext *s)
{
- ff_mdct_end(&mdct->fft);
- av_freep(&mdct->window);
+ int chan_size = AC3_MAX_COEFS * s->num_blocks;
+ int cpl = s->cpl_on;
+ s->ac3dsp.float_to_fixed24(s->fixed_coef_buffer + (chan_size * !cpl),
+ s->mdct_coef_buffer + (chan_size * !cpl),
+ chan_size * (s->channels + cpl));
}
-/**
- * Initialize MDCT tables.
- * @param nbits log2(MDCT size)
+/*
+ * Clip MDCT coefficients to allowable range.
*/
-static av_cold int mdct_init(AVCodecContext *avctx, AC3MDCTContext *mdct,
- int nbits)
+static void clip_coefficients(AudioDSPContext *adsp, float *coef,
+ unsigned int len)
{
- float *window;
- int i, n, n2;
-
- n = 1 << nbits;
- n2 = n >> 1;
-
- window = av_malloc(n * sizeof(*window));
- if (!window) {
- av_log(avctx, AV_LOG_ERROR, "Cannot allocate memory.\n");
- return AVERROR(ENOMEM);
- }
- ff_kbd_window_init(window, 5.0, n2);
- for (i = 0; i < n2; i++)
- window[n-1-i] = window[i];
- mdct->window = window;
-
- return ff_mdct_init(&mdct->fft, nbits, 0, -2.0 / n);
+ adsp->vector_clipf(coef, coef, len, COEF_MIN, COEF_MAX);
}
-/**
- * Calculate a 512-point MDCT
- * @param out 256 output frequency coefficients
- * @param in 512 windowed input audio samples
+/*
+ * Calculate a single coupling coordinate.
*/
-static void mdct512(AC3MDCTContext *mdct, float *out, float *in)
+static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
{
- mdct->fft.mdct_calc(&mdct->fft, out, in);
+ float coord = 0.125;
+ if (energy_cpl > 0)
+ coord *= sqrtf(energy_ch / energy_cpl);
+ return FFMIN(coord, COEF_MAX);
}
+#include "ac3enc_template.c"
+
+
/**
- * Apply KBD window to input samples prior to MDCT.
+ * Finalize MDCT and free allocated memory.
+ *
+ * @param s AC-3 encoder private context
*/
-static void apply_window(DSPContext *dsp, float *output, const float *input,
- const float *window, int n)
+av_cold void ff_ac3_float_mdct_end(AC3EncodeContext *s)
{
- dsp->vector_fmul(output, input, window, n);
+ ff_mdct_end(&s->mdct);
+ av_freep(&s->mdct_window);
}
/**
- * Normalize the input samples to use the maximum available precision.
+ * Initialize MDCT tables.
+ *
+ * @param s AC-3 encoder private context
+ * @return 0 on success, negative error code on failure
*/
-static int normalize_samples(AC3EncodeContext *s)
+av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s)
{
- /* Normalization is not needed for floating-point samples, so just return 0 */
- return 0;
+ float *window;
+ int i, n, n2;
+
+ n = 1 << 9;
+ n2 = n >> 1;
+
+ window = av_malloc(n * sizeof(*window));
+ if (!window) {
+ av_log(s->avctx, AV_LOG_ERROR, "Cannot allocate memory.\n");
+ return AVERROR(ENOMEM);
+ }
+ ff_kbd_window_init(window, 5.0, n2);
+ for (i = 0; i < n2; i++)
+ window[n-1-i] = window[i];
+ s->mdct_window = window;
+
+ return ff_mdct_init(&s->mdct, 9, 0, -2.0 / n);
}
-/**
- * Scale MDCT coefficients from float to 24-bit fixed-point.
- */
-static void scale_coefficients(AC3EncodeContext *s)
+av_cold int ff_ac3_float_encode_init(AVCodecContext *avctx)
{
- s->ac3dsp.float_to_fixed24(s->fixed_coef_buffer, s->mdct_coef_buffer,
- AC3_MAX_COEFS * AC3_MAX_BLOCKS * s->channels);
+ AC3EncodeContext *s = avctx->priv_data;
+ avpriv_float_dsp_init(&s->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
+ return ff_ac3_encode_init(avctx);
}
-
AVCodec ff_ac3_encoder = {
- "ac3",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_AC3,
- sizeof(AC3EncodeContext),
- ac3_encode_init,
- ac3_encode_frame,
- ac3_encode_close,
- NULL,
- .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
- .channel_layouts = ac3_channel_layouts,
+ .name = "ac3",
+ .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"),
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_AC3,
+ .priv_data_size = sizeof(AC3EncodeContext),
+ .init = ff_ac3_float_encode_init,
+ .encode2 = ff_ac3_float_encode_frame,
+ .close = ff_ac3_encode_close,
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
+ AV_SAMPLE_FMT_NONE },
+ .priv_class = &ac3enc_class,
+ .channel_layouts = ff_ac3_channel_layouts,
+ .defaults = ac3_defaults,
};