static int getBitrateMode(int bitrate)
{
/* make the correspondance between bitrate and mode */
- AMR_bitrates rates[] = { { 4750, MR475},
+ static const AMR_bitrates rates[] = {{ 4750, MR475},
{ 5150, MR515},
{ 5900, MR59},
{ 6700, MR67},
s->frameCount = 0;
s->decState = Decoder_Interface_init();
if (!s->decState) {
- av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\r\n");
+ av_log(avctx, AV_LOG_ERROR, "Decoder_Interface_init error\n");
return -1;
}
if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "amr_nb: multichannel decoding not supported\n");
- return -1;
+ return AVERROR(ENOSYS);
}
return 0;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AMRContext *s = avctx->priv_data;
- const uint8_t *amrData = buf;
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;
if (packet_size > buf_size) {
av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
buf_size, packet_size);
- return -1;
+ 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]); */
+ /* av_log(NULL, AV_LOG_DEBUG, "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->decState, buf, data, 0);
*data_size = 160 * 2;
return packet_size;
if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Only 8000Hz sample rate supported\n");
- return -1;
+ return AVERROR(ENOSYS);
}
if (avctx->channels != 1) {
av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
- return -1;
+ return AVERROR(ENOSYS);
}
avctx->frame_size = 160;
if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
- return -1;
+ return AVERROR(ENOSYS);
}
return 0;
if ((s->enc_bitrate = getBitrateMode(avctx->bit_rate)) < 0) {
av_log(avctx, AV_LOG_ERROR, nb_bitrate_unsupported);
- return -1;
+ return AVERROR(ENOSYS);
}
written = Encoder_Interface_Encode(s->enstate, s->enc_bitrate, data,
#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();
amr_decode_fix_avctx(avctx);
if (avctx->channels > 1) {
av_log(avctx, AV_LOG_ERROR, "amr_wb: multichannel decoding not supported\n");
- return -1;
+ return AVERROR(ENOSYS);
}
return 0;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AMRWBContext *s = avctx->priv_data;
- const uint8_t *amrData = buf;
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) {
av_log(avctx, AV_LOG_ERROR, "amr frame too short (%u, should be %u)\n",
buf_size, packet_size + 1);
- return -1;
+ 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;
}