*/
/**
- * @file nellymoserenc.c
+ * @file libavcodec/nellymoserenc.c
* Nellymoser encoder
* by Bartlomiej Wolowiec
*
* Generic codec information: libavcodec/nellymoserdec.c
*
- * Some information also from: http://www1.mplayerhq.hu/ASAO/ASAO.zip
+ * Some information also from: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip
* (Copyright Joseph Artsimovich and UAB "DKD")
*
* for more information about nellymoser format, visit:
#include "dsputil.h"
#define BITSTREAM_WRITER_LE
-#include "bitstream.h"
+#include "put_bits.h"
#define POW_TABLE_SIZE (1<<11)
#define POW_TABLE_OFFSET 3
+#define OPT_SIZE ((1<<15) + 3000)
typedef struct NellyMoserEncodeContext {
AVCodecContext *avctx;
int bufsel;
int have_saved;
DSPContext dsp;
- MDCTContext mdct_ctx;
+ FFTContext mdct_ctx;
DECLARE_ALIGNED_16(float, mdct_out[NELLY_SAMPLES]);
+ DECLARE_ALIGNED_16(float, in_buff[NELLY_SAMPLES]);
DECLARE_ALIGNED_16(float, buf[2][3 * NELLY_BUF_LEN]); ///< sample buffer
+ float (*opt )[NELLY_BANDS];
+ uint8_t (*path)[NELLY_BANDS];
} NellyMoserEncodeContext;
static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0);
static const float quant_lut_add[7] = { 0.0, 0.0, 2.0, 7.0, 21.0, 56.0, 157.0 };
static const uint8_t quant_lut_offset[8] = { 0, 0, 1, 4, 11, 32, 81, 230 };
-void apply_mdct(NellyMoserEncodeContext *s)
+static void apply_mdct(NellyMoserEncodeContext *s)
{
- DECLARE_ALIGNED_16(float, in_buff[NELLY_SAMPLES]);
-
- memcpy(in_buff, s->buf[s->bufsel], NELLY_BUF_LEN * sizeof(float));
- s->dsp.vector_fmul(in_buff, ff_sine_128, NELLY_BUF_LEN);
- s->dsp.vector_fmul_reverse(in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128,
+ memcpy(s->in_buff, s->buf[s->bufsel], NELLY_BUF_LEN * sizeof(float));
+ s->dsp.vector_fmul(s->in_buff, ff_sine_128, NELLY_BUF_LEN);
+ s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128,
NELLY_BUF_LEN);
- ff_mdct_calc(&s->mdct_ctx, s->mdct_out, in_buff);
+ ff_mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff);
s->dsp.vector_fmul(s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, NELLY_BUF_LEN);
s->dsp.vector_fmul_reverse(s->buf[s->bufsel] + 2 * NELLY_BUF_LEN, s->buf[1 - s->bufsel], ff_sine_128,
return -1;
}
- if (avctx->sample_rate != 8000 && avctx->sample_rate != 11025 &&
+ if (avctx->sample_rate != 8000 && avctx->sample_rate != 16000 &&
+ avctx->sample_rate != 11025 &&
avctx->sample_rate != 22050 && avctx->sample_rate != 44100 &&
avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL) {
- av_log(avctx, AV_LOG_ERROR, "Nellymoser works only with 8000, 11025, 22050 and 44100 sample rate\n");
+ av_log(avctx, AV_LOG_ERROR, "Nellymoser works only with 8000, 16000, 11025, 22050 and 44100 sample rate\n");
return -1;
}
avctx->frame_size = NELLY_SAMPLES;
s->avctx = avctx;
- ff_mdct_init(&s->mdct_ctx, 8, 0);
+ ff_mdct_init(&s->mdct_ctx, 8, 0, 1.0);
dsputil_init(&s->dsp, avctx);
/* Generate overlap window */
for (i = 0; i < POW_TABLE_SIZE; i++)
pow_table[i] = -pow(2, -i / 2048.0 - 3.0 + POW_TABLE_OFFSET);
+ if (s->avctx->trellis) {
+ s->opt = av_malloc(NELLY_BANDS * OPT_SIZE * sizeof(float ));
+ s->path = av_malloc(NELLY_BANDS * OPT_SIZE * sizeof(uint8_t));
+ }
+
return 0;
}
NellyMoserEncodeContext *s = avctx->priv_data;
ff_mdct_end(&s->mdct_ctx);
+
+ if (s->avctx->trellis) {
+ av_free(s->opt);
+ av_free(s->path);
+ }
+
return 0;
}
}
}
-#define OPT_SIZE ((1<<15) + 3000)
-
static inline float distance(float x, float y, int band)
{
//return pow(fabs(x-y), 2.0);
int i, j, band, best_idx;
float power_candidate, best_val;
- float opt[NELLY_BANDS][OPT_SIZE];
- int path[NELLY_BANDS][OPT_SIZE];
+ float (*opt )[NELLY_BANDS] = s->opt ;
+ uint8_t(*path)[NELLY_BANDS] = s->path;
for (i = 0; i < NELLY_BANDS * OPT_SIZE; i++) {
opt[0][i] = INFINITY;
if (!block)
put_bits(&pb, NELLY_HEADER_BITS + NELLY_DETAIL_BITS - put_bits_count(&pb), 0);
}
+
+ flush_put_bits(&pb);
}
static int encode_frame(AVCodecContext *avctx, uint8_t *frame, int buf_size, void *data)
.encode = encode_frame,
.close = encode_end,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
- .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao Codec"),
+ .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"),
};