AMR-WB support by (Johannes Carlsson <joca at rixmail dot se>)
Originally committed as revision 2311 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
parent
cd1f22f97e
commit
d663a1fdc0
10 changed files with 395 additions and 114 deletions
|
|
@ -21,7 +21,7 @@ ifeq ($(CONFIG_RISKY),yes)
|
|||
OBJS+= asf.o
|
||||
endif
|
||||
|
||||
ifeq ($(AMR_NB),yes)
|
||||
ifeq ($(AMR_NB),yes) | ifeq ($(AMR_NB_FIXED),yes) | ifeq ($(AMR_WB),yes)
|
||||
OBJS+= amr.o
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ void av_register_all(void)
|
|||
ipmovie_init();
|
||||
wc3_init();
|
||||
|
||||
#ifdef AMR_NB
|
||||
#if defined(AMR_NB) || defined(AMR_NB_FIXED) || defined(AMR_WB)
|
||||
amr_init();
|
||||
#endif
|
||||
yuv4mpeg_init();
|
||||
|
|
|
|||
|
|
@ -20,34 +20,34 @@
|
|||
/*
|
||||
Write and read amr data according to RFC3267, http://www.ietf.org/rfc/rfc3267.txt?number=3267
|
||||
|
||||
Only amr narrowband (not amr-wb) is supported for now.
|
||||
Only mono files are supported.
|
||||
|
||||
*/
|
||||
#include "avformat.h"
|
||||
#include "avi.h"
|
||||
|
||||
static const unsigned char AMR_header [] = "#!AMR\n";
|
||||
|
||||
/* AMR_FILE header */
|
||||
static int put_amr_header(ByteIOContext *pb, AVCodecContext *enc)
|
||||
{
|
||||
put_tag(pb, AMR_header); /* magic number */
|
||||
return 0;
|
||||
}
|
||||
static const unsigned char AMRWB_header [] = "#!AMR-WB\n";
|
||||
|
||||
static int amr_write_header(AVFormatContext *s)
|
||||
{
|
||||
ByteIOContext *pb = &s->pb;
|
||||
AVCodecContext *enc = &s->streams[0]->codec;
|
||||
|
||||
s->priv_data = NULL;
|
||||
|
||||
/* format header */
|
||||
if (put_amr_header(pb, &s->streams[0]->codec) < 0) {
|
||||
return -1;
|
||||
if (enc->codec_id == CODEC_ID_AMR_NB)
|
||||
{
|
||||
put_tag(pb, AMR_header); /* magic number */
|
||||
}
|
||||
else if(enc->codec_id == CODEC_ID_AMR_WB)
|
||||
{
|
||||
put_tag(pb, AMRWB_header); /* magic number */
|
||||
}
|
||||
else
|
||||
{
|
||||
//This is an error!
|
||||
}
|
||||
|
||||
put_flush_packet(pb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -66,10 +66,13 @@ static int amr_write_trailer(AVFormatContext *s)
|
|||
|
||||
static int amr_probe(AVProbeData *p)
|
||||
{
|
||||
/* check file header */
|
||||
if (p->buf_size < 6)
|
||||
//Only check for "#!AMR" which could be amr-wb, amr-nb.
|
||||
//This will also trigger multichannel files: "#!AMR_MC1.0\n" and
|
||||
//"#!AMR-WB_MC1.0\n" (not supported)
|
||||
|
||||
if (p->buf_size < 5)
|
||||
return 0;
|
||||
if(memcmp(p->buf,AMR_header,6)==0)
|
||||
if(memcmp(p->buf,AMR_header,5)==0)
|
||||
return AVPROBE_SCORE_MAX;
|
||||
else
|
||||
return 0;
|
||||
|
|
@ -81,24 +84,44 @@ static int amr_read_header(AVFormatContext *s,
|
|||
{
|
||||
ByteIOContext *pb = &s->pb;
|
||||
AVStream *st;
|
||||
uint8_t header[6];
|
||||
uint8_t header[9];
|
||||
|
||||
get_buffer(pb, header, 6);
|
||||
|
||||
if(memcmp(header,AMR_header,6)!=0)
|
||||
{
|
||||
return -1;
|
||||
get_buffer(pb, header+6, 3);
|
||||
if(memcmp(header,AMRWB_header,9)!=0)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
st = av_new_stream(s, 0);
|
||||
if (!st)
|
||||
{
|
||||
return AVERROR_NOMEM;
|
||||
}
|
||||
|
||||
st->codec.codec_type = CODEC_TYPE_AUDIO;
|
||||
st->codec.codec_tag = CODEC_ID_AMR_WB;
|
||||
st->codec.codec_id = CODEC_ID_AMR_WB;
|
||||
st->codec.channels = 1;
|
||||
st->codec.sample_rate = 16000;
|
||||
}
|
||||
else
|
||||
{
|
||||
st = av_new_stream(s, 0);
|
||||
if (!st)
|
||||
{
|
||||
return AVERROR_NOMEM;
|
||||
}
|
||||
|
||||
st->codec.codec_type = CODEC_TYPE_AUDIO;
|
||||
st->codec.codec_tag = CODEC_ID_AMR_NB;
|
||||
st->codec.codec_id = CODEC_ID_AMR_NB;
|
||||
st->codec.channels = 1;
|
||||
st->codec.sample_rate = 8000;
|
||||
}
|
||||
|
||||
st = av_new_stream(s, 0);
|
||||
if (!st)
|
||||
return AVERROR_NOMEM;
|
||||
|
||||
st->codec.codec_type = CODEC_TYPE_AUDIO;
|
||||
st->codec.codec_tag = CODEC_ID_AMR_NB;
|
||||
st->codec.codec_id = CODEC_ID_AMR_NB;
|
||||
st->codec.channels = 1;
|
||||
st->codec.sample_rate = 8000;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -107,39 +130,82 @@ static int amr_read_header(AVFormatContext *s,
|
|||
static int amr_read_packet(AVFormatContext *s,
|
||||
AVPacket *pkt)
|
||||
{
|
||||
static uint16_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
|
||||
uint8_t toc, q, ft;
|
||||
int read;
|
||||
int size;
|
||||
AVCodecContext *enc = &s->streams[0]->codec;
|
||||
|
||||
if (url_feof(&s->pb))
|
||||
return -EIO;
|
||||
|
||||
toc=0;
|
||||
|
||||
toc=get_byte(&s->pb);
|
||||
|
||||
q = (toc >> 2) & 0x01;
|
||||
ft = (toc >> 3) & 0x0F;
|
||||
|
||||
size=packed_size[ft];
|
||||
//printf("amr_read_packet size=%d\n",size);
|
||||
|
||||
if (av_new_packet(pkt, size+1))
|
||||
return -EIO;
|
||||
pkt->stream_index = 0;
|
||||
|
||||
pkt->data[0]=toc;
|
||||
|
||||
read = get_buffer(&s->pb, pkt->data+1, size);
|
||||
|
||||
if (read != size)
|
||||
if (enc->codec_id == CODEC_ID_AMR_NB)
|
||||
{
|
||||
const static uint8_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
|
||||
uint8_t toc, q, ft;
|
||||
int read;
|
||||
int size;
|
||||
|
||||
if (url_feof(&s->pb))
|
||||
{
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
toc=get_byte(&s->pb);
|
||||
q = (toc >> 2) & 0x01;
|
||||
ft = (toc >> 3) & 0x0F;
|
||||
|
||||
size=packed_size[ft];
|
||||
|
||||
if (av_new_packet(pkt, size+1))
|
||||
{
|
||||
return -EIO;
|
||||
}
|
||||
pkt->stream_index = 0;
|
||||
|
||||
pkt->data[0]=toc;
|
||||
|
||||
read = get_buffer(&s->pb, pkt->data+1, size);
|
||||
|
||||
if (read != size)
|
||||
{
|
||||
av_free_packet(pkt);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
else if(enc->codec_id == CODEC_ID_AMR_WB)
|
||||
{
|
||||
static uint8_t packed_size[16] = {18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1};
|
||||
uint8_t toc, mode;
|
||||
int read;
|
||||
int size;
|
||||
|
||||
if (url_feof(&s->pb))
|
||||
{
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
toc=get_byte(&s->pb);
|
||||
mode = (uint8_t)((toc >> 3) & 0x0F);
|
||||
size = packed_size[mode];
|
||||
|
||||
if ( (size==0) || av_new_packet(pkt, size))
|
||||
{
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
pkt->stream_index = 0;
|
||||
pkt->data[0]=toc;
|
||||
|
||||
read = get_buffer(&s->pb, pkt->data+1, size-1);
|
||||
|
||||
if (read != (size-1))
|
||||
{
|
||||
av_free_packet(pkt);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
av_free_packet(pkt);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int amr_read_close(AVFormatContext *s)
|
||||
|
|
@ -150,7 +216,7 @@ static int amr_read_close(AVFormatContext *s)
|
|||
static AVInputFormat amr_iformat = {
|
||||
"amr",
|
||||
"3gpp amr file format",
|
||||
0,
|
||||
0, /*priv_data_size*/
|
||||
amr_probe,
|
||||
amr_read_header,
|
||||
amr_read_packet,
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ static const CodecTag mov_audio_tags[] = {
|
|||
{ CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG 4 AAC or audio ? */
|
||||
/* The standard for mpeg4 audio is still not normalised AFAIK anyway */
|
||||
{ CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
|
||||
{ CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
|
||||
{ CODEC_ID_NONE, 0 },
|
||||
};
|
||||
|
||||
|
|
@ -850,10 +851,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
|
|||
#endif
|
||||
} else {
|
||||
st->codec.codec_id = codec_get_id(mov_audio_tags, format);
|
||||
if(st->codec.codec_id==CODEC_ID_AMR_NB) //from TS26.244
|
||||
if(st->codec.codec_id==CODEC_ID_AMR_NB || st->codec.codec_id==CODEC_ID_AMR_WB) //from TS26.244
|
||||
{
|
||||
#ifdef DEBUG
|
||||
printf("AMR-NB audio identified!!\n");
|
||||
printf("AMR-NB or AMR-WB audio identified!!\n");
|
||||
#endif
|
||||
get_be32(pb);get_be32(pb); //Reserved_8
|
||||
get_be16(pb);//Reserved_2
|
||||
|
|
@ -863,41 +864,26 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
|
|||
get_be16(pb);//Reserved_2
|
||||
|
||||
//AMRSpecificBox.(10 bytes)
|
||||
|
||||
#ifdef DEBUG
|
||||
int damr_size=
|
||||
#endif
|
||||
|
||||
get_be32(pb); //size
|
||||
#ifdef DEBUG
|
||||
int damr_type=
|
||||
#endif
|
||||
get_be32(pb); //type=='damr'
|
||||
#ifdef DEBUG
|
||||
int damr_vendor=
|
||||
#endif
|
||||
get_be32(pb); //vendor
|
||||
get_byte(pb); //decoder version
|
||||
get_be16(pb); //mode_set
|
||||
get_byte(pb); //mode_change_period
|
||||
get_byte(pb); //frames_per_sample
|
||||
|
||||
#ifdef DEBUG
|
||||
printf("Audio: damr_type=%c%c%c%c damr_size=%d damr_vendor=%c%c%c%c\n",
|
||||
(damr_type >> 24) & 0xff,
|
||||
(damr_type >> 16) & 0xff,
|
||||
(damr_type >> 8) & 0xff,
|
||||
(damr_type >> 0) & 0xff,
|
||||
damr_size,
|
||||
(damr_vendor >> 24) & 0xff,
|
||||
(damr_vendor >> 16) & 0xff,
|
||||
(damr_vendor >> 8) & 0xff,
|
||||
(damr_vendor >> 0) & 0xff
|
||||
);
|
||||
#endif
|
||||
|
||||
st->duration = AV_NOPTS_VALUE;//Not possible to get from this info, must count number of AMR frames
|
||||
st->codec.sample_rate=8000;
|
||||
st->codec.channels=1;
|
||||
if(st->codec.codec_id==CODEC_ID_AMR_NB)
|
||||
{
|
||||
st->codec.sample_rate=8000;
|
||||
st->codec.channels=1;
|
||||
}
|
||||
else //AMR-WB
|
||||
{
|
||||
st->codec.sample_rate=16000;
|
||||
st->codec.channels=1;
|
||||
}
|
||||
st->codec.bits_per_sample=16;
|
||||
st->codec.bit_rate=0; /*It is not possible to tell this before we have
|
||||
an audio frame and even then every frame can be different*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue