#include "avcodec.h"
#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
}
typedef struct AMRContext {
- int frame_count;
+ AVClass *av_class;
void *dec_state;
void *enc_state;
int enc_bitrate;
+ int enc_mode;
+ int enc_dtx;
} AMRContext;
+static const AVOption options[] = {
+ { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRContext, enc_dtx), AV_OPT_TYPE_INT, { 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_decode_init(AVCodecContext *avctx)
{
AMRContext *s = avctx->priv_data;
- s->frame_count = 0;
s->dec_state = Decoder_Interface_init();
if (!s->dec_state) {
av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n");
AMRContext *s = avctx->priv_data;
static const uint8_t block_size[16] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 };
enum Mode dec_mode;
- int packet_size;
+ int packet_size, out_size;
av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",
- buf, buf_size, s->frame_count);
+ buf, buf_size, avctx->frame_number);
+
+ out_size = 160 * av_get_bytes_per_sample(avctx->sample_fmt);
+ if (*data_size < out_size) {
+ av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
+ return AVERROR(EINVAL);
+ }
dec_mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[dec_mode] + 1;
return AVERROR_INVALIDDATA;
}
- s->frame_count++;
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, data, 0);
- *data_size = 160 * 2;
+ *data_size = out_size;
return packet_size;
}
AVCodec ff_libopencore_amrnb_decoder = {
- "libopencore_amrnb",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_AMR_NB,
- sizeof(AMRContext),
- amr_nb_decode_init,
- NULL,
- amr_nb_decode_close,
- amr_nb_decode_frame,
+ .name = "libopencore_amrnb",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_AMR_NB,
+ .priv_data_size = sizeof(AMRContext),
+ .init = amr_nb_decode_init,
+ .close = amr_nb_decode_close,
+ .decode = amr_nb_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
};
{
AMRContext *s = avctx->priv_data;
- s->frame_count = 0;
-
if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
return AVERROR(ENOSYS);
avctx->frame_size = 160;
avctx->coded_frame = avcodec_alloc_frame();
- s->enc_state = Encoder_Interface_init(0);
+ s->enc_state = Encoder_Interface_init(s->enc_dtx);
if (!s->enc_state) {
av_log(avctx, AV_LOG_ERROR, "Encoder_Interface_init error\n");
return -1;
}
- s->enc_bitrate = get_bitrate_mode(avctx->bit_rate, avctx);
+ s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
+ s->enc_bitrate = avctx->bit_rate;
return 0;
}
AMRContext *s = avctx->priv_data;
int written;
- s->enc_bitrate = get_bitrate_mode(avctx->bit_rate, avctx);
+ if (s->enc_bitrate != avctx->bit_rate) {
+ s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
+ s->enc_bitrate = avctx->bit_rate;
+ }
- written = Encoder_Interface_Encode(s->enc_state, s->enc_bitrate, data,
+ written = Encoder_Interface_Encode(s->enc_state, s->enc_mode, data,
frame, 0);
av_dlog(avctx, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
- written, s->enc_bitrate, frame[0]);
+ written, s->enc_mode, frame[0]);
return written;
}
AVCodec ff_libopencore_amrnb_encoder = {
- "libopencore_amrnb",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_AMR_NB,
- sizeof(AMRContext),
- amr_nb_encode_init,
- amr_nb_encode_frame,
- amr_nb_encode_close,
- NULL,
+ .name = "libopencore_amrnb",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_AMR_NB,
+ .priv_data_size = sizeof(AMRContext),
+ .init = amr_nb_encode_init,
+ .encode = amr_nb_encode_frame,
+ .close = amr_nb_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),
+ .priv_class = &class,
};
#endif
int buf_size = avpkt->size;
AMRWBContext *s = avctx->priv_data;
int mode;
- int packet_size;
+ int packet_size, out_size;
static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
- if (!buf_size)
- /* nothing to do */
- return 0;
+ out_size = 320 * av_get_bytes_per_sample(avctx->sample_fmt);
+ if (*data_size < out_size) {
+ av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n");
+ return AVERROR(EINVAL);
+ }
mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[mode];
}
D_IF_decode(s->state, buf, data, _good_frame);
- *data_size = 320 * 2;
+ *data_size = out_size;
return packet_size;
}
}
AVCodec ff_libopencore_amrwb_decoder = {
- "libopencore_amrwb",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_AMR_WB,
- sizeof(AMRWBContext),
- amr_wb_decode_init,
- NULL,
- amr_wb_decode_close,
- amr_wb_decode_frame,
+ .name = "libopencore_amrwb",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_AMR_WB,
+ .priv_data_size = sizeof(AMRWBContext),
+ .init = amr_wb_decode_init,
+ .close = amr_wb_decode_close,
+ .decode = amr_wb_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Wide-Band"),
};
projects / ffmpeg / blobdiff