# HG changeset patch # User bwolowiec # Date 1220210793 0 # Node ID e2573d045e7901300d3ec49dba031cfd4d3e7d2c # Parent 94f82ed28dc41c9cd50c890df1b08c4e9b77b4ee Okayed parts of nellymoserenc.c diff -r 94f82ed28dc4 -r e2573d045e79 nellymoserenc.c --- a/nellymoserenc.c Sun Aug 31 08:09:54 2008 +0000 +++ b/nellymoserenc.c Sun Aug 31 19:26:33 2008 +0000 @@ -48,6 +48,8 @@ typedef struct NellyMoserEncodeContext { AVCodecContext *avctx; int last_frame; + DSPContext dsp; + MDCTContext mdct_ctx; } NellyMoserEncodeContext; static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0); @@ -110,6 +112,13 @@ return -1; } + if (avctx->sample_rate != 8000 && 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"); + return -1; + } + avctx->frame_size = NELLY_SAMPLES; s->avctx = avctx; ff_mdct_init(&s->mdct_ctx, 8, 0); @@ -131,6 +140,12 @@ return 0; } +#define find_best(val, table, LUT, LUT_add, LUT_size) \ + best_idx = \ + LUT[av_clip ((lrintf(val) >> 8) + LUT_add, 0, LUT_size - 1)]; \ + if (fabs(val - table[best_idx]) > fabs(val - table[best_idx + 1])) \ + best_idx++; + AVCodec nellymoser_encoder = { .name = "nellymoser", .type = CODEC_TYPE_AUDIO,