X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fau.c;h=2f12f323d475b38f33bb0dc21f9536ca49ee8d63;hb=e8e2b2ef171353dc593f41d7c4d5cdb11541e109;hp=6ce326f57a60cd18e5e0c1815ab9e9faa5598f50;hpb=ecc2c0a46438d4cfc526d4b10529c0f3ce0e5b5d;p=ffmpeg diff --git a/libavformat/au.c b/libavformat/au.c index 6ce326f57a6..2f12f323d47 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -1,20 +1,22 @@ -/* - * AU encoder and decoder +/* + * AU muxer and demuxer * Copyright (c) 2001 Fabrice Bellard. * - * This library is free software; you can redistribute it and/or + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* @@ -26,30 +28,34 @@ */ #include "avformat.h" -#include "avi.h" +#include "raw.h" +#include "riff.h" /* if we don't know the size in advance */ -#define AU_UNKOWN_SIZE ((uint32_t)(~0)) +#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) /* The ffmpeg codecs we support, and the IDs they have in the file */ -static const CodecTag codec_au_tags[] = { +static const AVCodecTag codec_au_tags[] = { { CODEC_ID_PCM_MULAW, 1 }, + { CODEC_ID_PCM_S8, 2 }, { CODEC_ID_PCM_S16BE, 3 }, + { CODEC_ID_PCM_S24BE, 4 }, + { CODEC_ID_PCM_S32BE, 5 }, + { CODEC_ID_PCM_F32BE, 6 }, + { CODEC_ID_PCM_F64BE, 7 }, { CODEC_ID_PCM_ALAW, 27 }, { 0, 0 }, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* AUDIO_FILE header */ static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) { - if(!enc->codec_tag) - enc->codec_tag = codec_get_tag(codec_au_tags, enc->codec_id); if(!enc->codec_tag) return -1; put_tag(pb, ".snd"); /* magic number */ put_be32(pb, 24); /* header size */ - put_be32(pb, AU_UNKOWN_SIZE); /* data size */ + put_be32(pb, AU_UNKNOWN_SIZE); /* data size */ put_be32(pb, (uint32_t)enc->codec_tag); /* codec ID */ put_be32(pb, enc->sample_rate); put_be32(pb, (uint32_t)enc->channels); @@ -58,12 +64,12 @@ static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) static int au_write_header(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; s->priv_data = NULL; /* format header */ - if (put_au_header(pb, &s->streams[0]->codec) < 0) { + if (put_au_header(pb, s->streams[0]->codec) < 0) { return -1; } @@ -74,17 +80,17 @@ static int au_write_header(AVFormatContext *s) static int au_write_packet(AVFormatContext *s, AVPacket *pkt) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; put_buffer(pb, pkt->data, pkt->size); return 0; } static int au_write_trailer(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; offset_t file_size; - if (!url_is_streamed(&s->pb)) { + if (!url_is_streamed(s->pb)) { /* update file size */ file_size = url_ftell(pb); @@ -97,13 +103,11 @@ static int au_write_trailer(AVFormatContext *s) return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int au_probe(AVProbeData *p) { /* check file header */ - if (p->buf_size <= 24) - return 0; if (p->buf[0] == '.' && p->buf[1] == 's' && p->buf[2] == 'n' && p->buf[3] == 'd') return AVPROBE_SCORE_MAX; @@ -117,7 +121,7 @@ static int au_read_header(AVFormatContext *s, { int size; unsigned int tag; - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; unsigned int id, codec, channels, rate; AVStream *st; @@ -127,11 +131,11 @@ static int au_read_header(AVFormatContext *s, return -1; size = get_be32(pb); /* header size */ get_be32(pb); /* data size */ - + id = get_be32(pb); rate = get_be32(pb); channels = get_be32(pb); - + codec = codec_get_id(codec_au_tags, id); if (size >= 24) { @@ -143,11 +147,12 @@ static int au_read_header(AVFormatContext *s, st = av_new_stream(s, 0); if (!st) return -1; - st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_tag = id; - st->codec.codec_id = codec; - st->codec.channels = channels; - st->codec.sample_rate = rate; + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_tag = id; + st->codec->codec_id = codec; + st->codec->channels = channels; + st->codec->sample_rate = rate; + av_set_pts_info(st, 64, 1, rate); return 0; } @@ -158,42 +163,37 @@ static int au_read_packet(AVFormatContext *s, { int ret; - if (url_feof(&s->pb)) - return AVERROR_IO; - if (av_new_packet(pkt, MAX_SIZE)) - return AVERROR_IO; + if (url_feof(s->pb)) + return AVERROR(EIO); + ret= av_get_packet(s->pb, pkt, MAX_SIZE); + if (ret < 0) + return AVERROR(EIO); pkt->stream_index = 0; - pkt->flags |= PKT_FLAG_KEY; - ret = get_buffer(&s->pb, pkt->data, pkt->size); - if (ret < 0) - av_free_packet(pkt); /* note: we need to modify the packet size here to handle the last packet */ pkt->size = ret; return 0; } -static int au_read_close(AVFormatContext *s) -{ - return 0; -} - -static AVInputFormat au_iformat = { +#ifdef CONFIG_AU_DEMUXER +AVInputFormat au_demuxer = { "au", - "SUN AU Format", + NULL_IF_CONFIG_SMALL("SUN AU format"), 0, au_probe, au_read_header, au_read_packet, - au_read_close, + NULL, pcm_read_seek, + .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0}, }; +#endif -#ifdef CONFIG_ENCODERS -static AVOutputFormat au_oformat = { +#ifdef CONFIG_AU_MUXER +AVOutputFormat au_muxer = { "au", - "SUN AU Format", + NULL_IF_CONFIG_SMALL("SUN AU format"), "audio/basic", "au", 0, @@ -202,14 +202,6 @@ static AVOutputFormat au_oformat = { au_write_header, au_write_packet, au_write_trailer, + .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0}, }; -#endif //CONFIG_ENCODERS - -int au_init(void) -{ - av_register_input_format(&au_iformat); -#ifdef CONFIG_ENCODERS - av_register_output_format(&au_oformat); -#endif //CONFIG_ENCODERS - return 0; -} +#endif //CONFIG_AU_MUXER