*/
#include "avcodec.h"
+#include "libavutil/avstring.h"
+#include "libavutil/opt.h"
static void amr_decode_fix_avctx(AVCodecContext *avctx)
{
#include <opencore-amrnb/interf_dec.h>
#include <opencore-amrnb/interf_enc.h>
-static const char nb_bitrate_unsupported[] =
- "bitrate not supported: use one of 4.75k, 5.15k, 5.9k, 6.7k, 7.4k, 7.95k, 10.2k or 12.2k\n";
-
/* Common code for fixed and float version*/
typedef struct AMR_bitrates {
int rate;
} AMR_bitrates;
/* Match desired bitrate */
-static int getBitrateMode(int bitrate)
+static int get_bitrate_mode(int bitrate, void *log_ctx)
{
/* make the correspondance between bitrate and mode */
- AMR_bitrates rates[] = { { 4750, MR475},
- { 5150, MR515},
- { 5900, MR59},
- { 6700, MR67},
- { 7400, MR74},
- { 7950, MR795},
- {10200, MR102},
- {12200, MR122}, };
- int i;
-
- for (i = 0; i < 8; i++)
+ 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;
- /* no bitrate matching, return an error */
- return -1;
+ 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 {
- int frameCount;
- void *decState;
- void *enstate;
+ AVClass *av_class;
+ int frame_count;
+ 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), FF_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;
+ AMRContext *s = avctx->priv_data;
- s->frameCount = 0;
- s->decState = Decoder_Interface_init();
- if (!s->decState) {
+ 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");
return -1;
}
{
AMRContext *s = avctx->priv_data;
- Decoder_Interface_exit(s->decState);
+ Decoder_Interface_exit(s->dec_state);
return 0;
}
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- AMRContext *s = avctx->priv_data;
- const uint8_t *amrData = buf;
+ 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;
- /* av_log(NULL, AV_LOG_DEBUG, "amr_decode_frame buf=%p buf_size=%d frameCount=%d!!\n",
- buf, buf_size, s->frameCount); */
+ av_dlog(avctx, "amr_decode_frame buf=%p buf_size=%d frame_count=%d!!\n",
+ buf, buf_size, s->frame_count);
- dec_mode = (buf[0] >> 3) & 0x000F;
+ dec_mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[dec_mode] + 1;
if (packet_size > buf_size) {
return AVERROR_INVALIDDATA;
}
- s->frameCount++;
- /* av_log(NULL, AV_LOG_DEBUG, "packet_size=%d amrData= 0x%X %X %X %X\n",
- packet_size, amrData[0], amrData[1], amrData[2], amrData[3]); */
+ 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->decState, amrData, data, 0);
+ Decoder_Interface_Decode(s->dec_state, buf, data, 0);
*data_size = 160 * 2;
return packet_size;
{
AMRContext *s = avctx->priv_data;
- s->frameCount = 0;
+ s->frame_count = 0;
if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
avctx->frame_size = 160;
avctx->coded_frame = avcodec_alloc_frame();
- s->enstate=Encoder_Interface_init(0);
- if (!s->enstate) {
+ 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;
}
- if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
- av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
- return AVERROR(ENOSYS);
- }
+ s->enc_mode = get_bitrate_mode(avctx->bit_rate, avctx);
+ s->enc_bitrate = avctx->bit_rate;
return 0;
}
{
AMRContext *s = avctx->priv_data;
- Encoder_Interface_exit(s->enstate);
+ Encoder_Interface_exit(s->enc_state);
av_freep(&avctx->coded_frame);
return 0;
}
AMRContext *s = avctx->priv_data;
int written;
- if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
- av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
- return AVERROR(ENOSYS);
+ 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->enstate, s->enc_bitrate, data,
+ written = Encoder_Interface_Encode(s->enc_state, s->enc_mode, data,
frame, 0);
- /* av_log(NULL, AV_LOG_DEBUG, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
- written, s->enc_bitrate, frame[0] ); */
+ av_dlog(avctx, "amr_nb_encode_frame encoded %u bytes, bitrate %u, first byte was %#02x\n",
+ written, s->enc_mode, frame[0]);
return written;
}
NULL,
.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
#include <opencore-amrwb/if_rom.h>
typedef struct AMRWBContext {
- int frameCount;
void *state;
} AMRWBContext;
{
AMRWBContext *s = avctx->priv_data;
- s->frameCount = 0;
- s->state = D_IF_init();
+ s->state = D_IF_init();
amr_decode_fix_avctx(avctx);
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- AMRWBContext *s = avctx->priv_data;
- const uint8_t *amrData = buf;
+ AMRWBContext *s = avctx->priv_data;
int mode;
int packet_size;
static const uint8_t block_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
/* nothing to do */
return 0;
- mode = (amrData[0] >> 3) & 0x000F;
+ mode = (buf[0] >> 3) & 0x000F;
packet_size = block_size[mode];
if (packet_size > buf_size) {
return AVERROR_INVALIDDATA;
}
- s->frameCount++;
- D_IF_decode(s->state, amrData, data, _good_frame);
+ D_IF_decode(s->state, buf, data, _good_frame);
*data_size = 320 * 2;
return packet_size;
}
projects / ffmpeg / blobdiff