static const char AMR_header [] = "#!AMR\n";
static const char AMRWB_header [] = "#!AMR-WB\n";
-#ifdef CONFIG_MUXERS
+#if CONFIG_AMR_MUXER
static int amr_write_header(AVFormatContext *s)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVCodecContext *enc = s->streams[0]->codec;
s->priv_data = NULL;
static int amr_write_packet(AVFormatContext *s, AVPacket *pkt)
{
- put_buffer(&s->pb, pkt->data, pkt->size);
- put_flush_packet(&s->pb);
+ put_buffer(s->pb, pkt->data, pkt->size);
+ put_flush_packet(s->pb);
return 0;
}
-
-static int amr_write_trailer(AVFormatContext *s)
-{
- return 0;
-}
-#endif /* CONFIG_MUXERS */
+#endif /* CONFIG_AMR_MUXER */
static int amr_probe(AVProbeData *p)
{
//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,5)==0)
return AVPROBE_SCORE_MAX;
else
static int amr_read_header(AVFormatContext *s,
AVFormatParameters *ap)
{
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVStream *st;
uint8_t header[9];
get_buffer(pb, header, 6);
+ st = av_new_stream(s, 0);
+ if (!st)
+ {
+ return AVERROR(ENOMEM);
+ }
if(memcmp(header,AMR_header,6)!=0)
{
get_buffer(pb, header+6, 3);
{
return -1;
}
- st = av_new_stream(s, 0);
- if (!st)
- {
- return AVERROR_NOMEM;
- }
st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
st->codec->codec_id = CODEC_ID_AMR_WB;
}
else
{
- st = av_new_stream(s, 0);
- if (!st)
- {
- return AVERROR_NOMEM;
- }
-
st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->sample_rate = 8000;
return 0;
}
-#define MAX_SIZE 32
-
static int amr_read_packet(AVFormatContext *s,
AVPacket *pkt)
{
AVCodecContext *enc = s->streams[0]->codec;
- int read, size, toc, mode;
+ int read, size = 0, toc, mode;
- if (url_feof(&s->pb))
+ if (url_feof(s->pb))
{
- return AVERROR_IO;
+ return AVERROR(EIO);
}
- toc=get_byte(&s->pb);
+//FIXME this is wrong, this should rather be in a AVParset
+ toc=get_byte(s->pb);
mode = (toc >> 3) & 0x0F;
if (enc->codec_id == CODEC_ID_AMR_NB)
if ( (size==0) || av_new_packet(pkt, size))
{
- return AVERROR_IO;
+ return AVERROR(EIO);
}
pkt->stream_index = 0;
- pkt->pos= url_ftell(&s->pb);
+ pkt->pos= url_ftell(s->pb);
pkt->data[0]=toc;
pkt->duration= enc->codec_id == CODEC_ID_AMR_NB ? 160 : 320;
- read = get_buffer(&s->pb, pkt->data+1, size-1);
+ read = get_buffer(s->pb, pkt->data+1, size-1);
if (read != size-1)
{
av_free_packet(pkt);
- return AVERROR_IO;
+ return AVERROR(EIO);
}
return 0;
}
-static int amr_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
-#ifdef CONFIG_AMR_DEMUXER
+#if CONFIG_AMR_DEMUXER
AVInputFormat amr_demuxer = {
"amr",
- "3gpp amr file format",
+ NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
0, /*priv_data_size*/
amr_probe,
amr_read_header,
amr_read_packet,
- amr_read_close,
+ NULL,
};
#endif
-#ifdef CONFIG_AMR_MUXER
+#if CONFIG_AMR_MUXER
AVOutputFormat amr_muxer = {
"amr",
- "3gpp amr file format",
+ NULL_IF_CONFIG_SMALL("3GPP AMR file format"),
"audio/amr",
"amr",
0,
CODEC_ID_NONE,
amr_write_header,
amr_write_packet,
- amr_write_trailer,
};
#endif