X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibopencore-amr.c;h=1f71a5bf011923b47827dfa65dd360d296eeee4a;hb=5053a9a1ffd907ae1d189c03c7e86bb375a44ded;hp=0c472b7b72a57db425f6f4df47ff6a5d6b052aff;hpb=ad961726dc0bec7435aae7fbab10471b9063018b;p=ffmpeg diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 0c472b7b72a..1f71a5bf011 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/audioconvert.h" -#include "avcodec.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" +#include "avcodec.h" #include "audio_frame_queue.h" #include "internal.h" @@ -34,7 +34,7 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx) avctx->sample_rate = 8000 * is_amr_wb; if (avctx->channels > 1) { - av_log_missing_feature(avctx, "multi-channel AMR", 0); + avpriv_report_missing_feature(avctx, "multi-channel AMR"); return AVERROR_PATCHWELCOME; } @@ -49,44 +49,8 @@ static int amr_decode_fix_avctx(AVCodecContext *avctx) #include #include -/* Common code for fixed and float version*/ -typedef struct AMR_bitrates { - int rate; - enum Mode mode; -} AMR_bitrates; - -/* Match desired bitrate */ -static int get_bitrate_mode(int bitrate, void *log_ctx) -{ - /* make the correspondance between bitrate and mode */ - static const AMR_bitrates rates[] = { - { 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 }, - { 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 } - }; - int i, best = -1, min_diff = 0; - char log_buf[200]; - - for (i = 0; i < 8; i++) { - if (rates[i].rate == bitrate) - return rates[i].mode; - if (best < 0 || abs(rates[i].rate - bitrate) < min_diff) { - best = i; - min_diff = abs(rates[i].rate - bitrate); - } - } - /* no bitrate matching exactly, log a warning */ - snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of "); - for (i = 0; i < 8; i++) - av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i].rate / 1000.f); - av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best].rate / 1000.f); - av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf); - - return best; -} - typedef struct AMRContext { AVClass *av_class; - AVFrame frame; void *dec_state; void *enc_state; int enc_bitrate; @@ -96,15 +60,7 @@ typedef struct AMRContext { AudioFrameQueue afq; } AMRContext; -static const AVOption options[] = { - { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, - { NULL } -}; - -static const AVClass class = { - "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT -}; - +#if CONFIG_LIBOPENCORE_AMRNB_DECODER static av_cold int amr_nb_decode_init(AVCodecContext *avctx) { AMRContext *s = avctx->priv_data; @@ -119,9 +75,6 @@ static av_cold int amr_nb_decode_init(AVCodecContext *avctx) return -1; } - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } @@ -137,6 +90,7 @@ static av_cold int amr_nb_decode_close(AVCodecContext *avctx) static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; AMRContext *s = avctx->priv_data; @@ -148,8 +102,8 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, buf, buf_size, avctx->frame_number); /* get output buffer */ - s->frame.nb_samples = 160; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = 160; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -166,10 +120,9 @@ static int amr_nb_decode_frame(AVCodecContext *avctx, void *data, av_dlog(avctx, "packet_size=%d buf= 0x%X %X %X %X\n", packet_size, buf[0], buf[1], buf[2], buf[3]); /* call decoder */ - Decoder_Interface_Decode(s->dec_state, buf, (short *)s->frame.data[0], 0); + Decoder_Interface_Decode(s->dec_state, buf, (short *)frame->data[0], 0); - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return packet_size; } @@ -185,6 +138,52 @@ AVCodec ff_libopencore_amrnb_decoder = { .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), }; +#endif /* CONFIG_LIBOPENCORE_AMRNB_DECODER */ + +#if CONFIG_LIBOPENCORE_AMRNB_ENCODER +/* Common code for fixed and float version*/ +typedef struct AMR_bitrates { + int rate; + enum Mode mode; +} AMR_bitrates; + +/* Match desired bitrate */ +static int get_bitrate_mode(int bitrate, void *log_ctx) +{ + /* make the correspondance between bitrate and mode */ + static const AMR_bitrates rates[] = { + { 4750, MR475 }, { 5150, MR515 }, { 5900, MR59 }, { 6700, MR67 }, + { 7400, MR74 }, { 7950, MR795 }, { 10200, MR102 }, { 12200, MR122 } + }; + int i, best = -1, min_diff = 0; + char log_buf[200]; + + for (i = 0; i < 8; i++) { + if (rates[i].rate == bitrate) + return rates[i].mode; + if (best < 0 || abs(rates[i].rate - bitrate) < min_diff) { + best = i; + min_diff = abs(rates[i].rate - bitrate); + } + } + /* no bitrate matching exactly, log a warning */ + snprintf(log_buf, sizeof(log_buf), "bitrate not supported: use one of "); + for (i = 0; i < 8; i++) + av_strlcatf(log_buf, sizeof(log_buf), "%.2fk, ", rates[i].rate / 1000.f); + av_strlcatf(log_buf, sizeof(log_buf), "using %.2fk", rates[best].rate / 1000.f); + av_log(log_ctx, AV_LOG_WARNING, "%s\n", log_buf); + + return best; +} + +static const AVOption options[] = { + { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM }, + { NULL } +}; + +static const AVClass class = { + "libopencore_amrnb", av_default_item_name, options, LIBAVUTIL_VERSION_INT +}; static av_cold int amr_nb_encode_init(AVCodecContext *avctx) { @@ -203,11 +202,6 @@ static av_cold int amr_nb_encode_init(AVCodecContext *avctx) avctx->frame_size = 160; avctx->delay = 50; ff_af_queue_init(avctx, &s->afq); -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); -#endif s->enc_state = Encoder_Interface_init(s->enc_dtx); if (!s->enc_state) { @@ -228,9 +222,6 @@ static av_cold int amr_nb_encode_close(AVCodecContext *avctx) Encoder_Interface_exit(s->enc_state); ff_af_queue_close(&s->afq); -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif return 0; } @@ -262,7 +253,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (frame->nb_samples < avctx->frame_size - avctx->delay) s->enc_last_frame = -1; } - if ((ret = ff_af_queue_add(&s->afq, frame) < 0)) { + if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) { av_freep(&flush_buf); return ret; } @@ -305,17 +296,17 @@ AVCodec ff_libopencore_amrnb_encoder = { .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"), .priv_class = &class, }; +#endif /* CONFIG_LIBOPENCORE_AMRNB_ENCODER */ -#endif +#endif /* CONFIG_LIBOPENCORE_AMRNB */ /* -----------AMR wideband ------------*/ -#if CONFIG_LIBOPENCORE_AMRWB +#if CONFIG_LIBOPENCORE_AMRWB_DECODER #include #include typedef struct AMRWBContext { - AVFrame frame; void *state; } AMRWBContext; @@ -329,15 +320,13 @@ static av_cold int amr_wb_decode_init(AVCodecContext *avctx) s->state = D_IF_init(); - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } static int amr_wb_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; AMRWBContext *s = avctx->priv_data; @@ -346,8 +335,8 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data, static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1}; /* get output buffer */ - s->frame.nb_samples = 320; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = 320; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -361,10 +350,9 @@ static int amr_wb_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - D_IF_decode(s->state, buf, (short *)s->frame.data[0], _good_frame); + D_IF_decode(s->state, buf, (short *)frame->data[0], _good_frame); - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return packet_size; } @@ -389,4 +377,4 @@ AVCodec ff_libopencore_amrwb_decoder = { .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), }; -#endif /* CONFIG_LIBOPENCORE_AMRWB */ +#endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */