X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fnellymoserenc.c;h=e1b1d793a4b556c6c9f11296d52aa4d374cca2e6;hb=7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f;hp=52ee2bc03be91d98fa6928fcebbc8ce62e92861f;hpb=7d485f165f7f6313002da1fe67c2742f0fbb16c9;p=ffmpeg diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 52ee2bc03be..e1b1d793a4b 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -4,40 +4,45 @@ * * Copyright (c) 2008 Bartlomiej Wolowiec * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavcodec/nellymoserenc.c + * @file * Nellymoser encoder * by Bartlomiej Wolowiec * * Generic codec information: libavcodec/nellymoserdec.c * - * Some information also from: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip + * Some information also from: http://samples.libav.org/A-codecs/Nelly_Moser/ASAO/ASAO.zip * (Copyright Joseph Artsimovich and UAB "DKD") * * for more information about nellymoser format, visit: * http://wiki.multimedia.cx/index.php?title=Nellymoser */ +#include "libavutil/mathematics.h" #include "nellymoser.h" #include "avcodec.h" +#include "audio_frame_queue.h" #include "dsputil.h" +#include "fft.h" +#include "internal.h" +#include "sinewin.h" #define BITSTREAM_WRITER_LE #include "put_bits.h" @@ -49,12 +54,12 @@ typedef struct NellyMoserEncodeContext { AVCodecContext *avctx; int last_frame; - int bufsel; - int have_saved; DSPContext dsp; - MDCTContext mdct_ctx; - DECLARE_ALIGNED_16(float, mdct_out[NELLY_SAMPLES]); - DECLARE_ALIGNED_16(float, buf[2][3 * NELLY_BUF_LEN]); ///< sample buffer + FFTContext mdct_ctx; + AudioFrameQueue afq; + DECLARE_ALIGNED(32, float, mdct_out)[NELLY_SAMPLES]; + DECLARE_ALIGNED(32, float, in_buff)[NELLY_SAMPLES]; + DECLARE_ALIGNED(32, float, buf)[3 * NELLY_BUF_LEN]; ///< sample buffer float (*opt )[NELLY_BANDS]; uint8_t (*path)[NELLY_BANDS]; } NellyMoserEncodeContext; @@ -109,30 +114,47 @@ static const float quant_lut_mul[7] = { 0.0, 0.0, 2.0, 2.0, 5.0, 12.0, 36.6 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, - NELLY_BUF_LEN); - ff_mdct_calc(&s->mdct_ctx, s->mdct_out, 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, - NELLY_BUF_LEN); - ff_mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN); + float *in0 = s->buf; + float *in1 = s->buf + NELLY_BUF_LEN; + float *in2 = s->buf + 2 * NELLY_BUF_LEN; + + s->dsp.vector_fmul (s->in_buff, in0, ff_sine_128, NELLY_BUF_LEN); + s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in1, ff_sine_128, NELLY_BUF_LEN); + s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff); + + s->dsp.vector_fmul (s->in_buff, in1, ff_sine_128, NELLY_BUF_LEN); + s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, in2, ff_sine_128, NELLY_BUF_LEN); + s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->in_buff); +} + +static av_cold int encode_end(AVCodecContext *avctx) +{ + NellyMoserEncodeContext *s = avctx->priv_data; + + ff_mdct_end(&s->mdct_ctx); + + if (s->avctx->trellis) { + av_free(s->opt); + av_free(s->path); + } + ff_af_queue_close(&s->afq); +#if FF_API_OLD_ENCODE_AUDIO + av_freep(&avctx->coded_frame); +#endif + + return 0; } static av_cold int encode_init(AVCodecContext *avctx) { NellyMoserEncodeContext *s = avctx->priv_data; - int i; + int i, ret; if (avctx->channels != 1) { av_log(avctx, AV_LOG_ERROR, "Nellymoser supports only 1 channel\n"); - return -1; + return AVERROR(EINVAL); } if (avctx->sample_rate != 8000 && avctx->sample_rate != 16000 && @@ -140,13 +162,16 @@ static av_cold int encode_init(AVCodecContext *avctx) 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, 16000, 11025, 22050 and 44100 sample rate\n"); - return -1; + return AVERROR(EINVAL); } avctx->frame_size = NELLY_SAMPLES; + avctx->delay = NELLY_BUF_LEN; + ff_af_queue_init(avctx, &s->afq); s->avctx = avctx; - ff_mdct_init(&s->mdct_ctx, 8, 0, 1.0); - dsputil_init(&s->dsp, avctx); + if ((ret = ff_mdct_init(&s->mdct_ctx, 8, 0, 32768.0)) < 0) + goto error; + ff_dsputil_init(&s->dsp, avctx); /* Generate overlap window */ ff_sine_window_init(ff_sine_128, 128); @@ -156,23 +181,24 @@ static av_cold int encode_init(AVCodecContext *avctx) 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)); + if (!s->opt || !s->path) { + ret = AVERROR(ENOMEM); + goto error; + } } - return 0; -} - -static av_cold int encode_end(AVCodecContext *avctx) -{ - NellyMoserEncodeContext *s = avctx->priv_data; - - ff_mdct_end(&s->mdct_ctx); - - if (s->avctx->trellis) { - av_free(s->opt); - av_free(s->path); +#if FF_API_OLD_ENCODE_AUDIO + avctx->coded_frame = avcodec_alloc_frame(); + if (!avctx->coded_frame) { + ret = AVERROR(ENOMEM); + goto error; } +#endif return 0; +error: + encode_end(avctx); + return ret; } #define find_best(val, table, LUT, LUT_add, LUT_size) \ @@ -270,7 +296,7 @@ static void get_exponent_dynamic(NellyMoserEncodeContext *s, float *cand, int *i } /** - * Encodes NELLY_SAMPLES samples. It assumes, that samples contains 3 * NELLY_BUF_LEN values + * Encode NELLY_SAMPLES samples. It assumes, that samples contains 3 * NELLY_BUF_LEN values * @param s encoder context * @param output output buffer * @param output_size size of output buffer @@ -346,50 +372,59 @@ static void encode_block(NellyMoserEncodeContext *s, unsigned char *output, int } flush_put_bits(&pb); + memset(put_bits_ptr(&pb), 0, output + output_size - put_bits_ptr(&pb)); } -static int encode_frame(AVCodecContext *avctx, uint8_t *frame, int buf_size, void *data) +static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet_ptr) { NellyMoserEncodeContext *s = avctx->priv_data; - int16_t *samples = data; - int i; + int ret; if (s->last_frame) return 0; - if (data) { - for (i = 0; i < avctx->frame_size; i++) { - s->buf[s->bufsel][i] = samples[i]; - } - for (; i < NELLY_SAMPLES; i++) { - s->buf[s->bufsel][i] = 0; - } - s->bufsel = 1 - s->bufsel; - if (!s->have_saved) { - s->have_saved = 1; - return 0; + memcpy(s->buf, s->buf + NELLY_SAMPLES, NELLY_BUF_LEN * sizeof(*s->buf)); + if (frame) { + memcpy(s->buf + NELLY_BUF_LEN, frame->data[0], + frame->nb_samples * sizeof(*s->buf)); + if (frame->nb_samples < NELLY_SAMPLES) { + memset(s->buf + NELLY_BUF_LEN + frame->nb_samples, 0, + (NELLY_SAMPLES - frame->nb_samples) * sizeof(*s->buf)); + if (frame->nb_samples >= NELLY_BUF_LEN) + s->last_frame = 1; } + if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) + return ret; } else { - memset(s->buf[s->bufsel], 0, sizeof(s->buf[0][0]) * NELLY_BUF_LEN); - s->bufsel = 1 - s->bufsel; + memset(s->buf + NELLY_BUF_LEN, 0, NELLY_SAMPLES * sizeof(*s->buf)); s->last_frame = 1; } - if (s->have_saved) { - encode_block(s, frame, buf_size); - return NELLY_BLOCK_LEN; + if ((ret = ff_alloc_packet(avpkt, NELLY_BLOCK_LEN))) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); + return ret; } + encode_block(s, avpkt->data, avpkt->size); + + /* Get the next frame pts/duration */ + ff_af_queue_remove(&s->afq, avctx->frame_size, &avpkt->pts, + &avpkt->duration); + + *got_packet_ptr = 1; return 0; } -AVCodec nellymoser_encoder = { - .name = "nellymoser", - .type = CODEC_TYPE_AUDIO, - .id = CODEC_ID_NELLYMOSER, +AVCodec ff_nellymoser_encoder = { + .name = "nellymoser", + .type = AVMEDIA_TYPE_AUDIO, + .id = CODEC_ID_NELLYMOSER, .priv_data_size = sizeof(NellyMoserEncodeContext), - .init = encode_init, - .encode = encode_frame, - .close = encode_end, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, - .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .init = encode_init, + .encode2 = encode_frame, + .close = encode_end, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, + .long_name = NULL_IF_CONFIG_SMALL("Nellymoser Asao"), + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_NONE }, };