X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fau.c;h=76da6e60920b16cb790eaf300e025133eca098a8;hb=0e729b2290cf2fc8084c18294a46d996c41e3924;hp=b560437d518a2b52e23d34c3b77d3917f700bcd7;hpb=bd5a60201e0fc253d55cef919a6d69de6efcbd1a;p=ffmpeg diff --git a/libavformat/au.c b/libavformat/au.c index b560437d518..76da6e60920 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -1,20 +1,22 @@ -/* - * AU encoder and decoder - * Copyright (c) 2001 Fabrice Bellard. +/* + * AU muxer and demuxer + * Copyright (c) 2001 Fabrice Bellard + * + * This file is part of Libav. * - * This library is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* @@ -26,83 +28,26 @@ */ #include "avformat.h" -#include "avi.h" - -/* if we don't know the size in advance */ -#define AU_UNKOWN_SIZE ((uint32_t)(~0)) - -/* The ffmpeg codecs we support, and the IDs they have in the file */ -static const CodecTag codec_au_tags[] = { - { CODEC_ID_PCM_MULAW, 1 }, - { CODEC_ID_PCM_S16BE, 3 }, - { CODEC_ID_PCM_ALAW, 27 }, - { 0, 0 }, +#include "internal.h" +#include "avio_internal.h" +#include "pcm.h" + +static const AVCodecTag codec_au_tags[] = { + { AV_CODEC_ID_PCM_MULAW, 1 }, + { AV_CODEC_ID_PCM_S8, 2 }, + { AV_CODEC_ID_PCM_S16BE, 3 }, + { AV_CODEC_ID_PCM_S24BE, 4 }, + { AV_CODEC_ID_PCM_S32BE, 5 }, + { AV_CODEC_ID_PCM_F32BE, 6 }, + { AV_CODEC_ID_PCM_F64BE, 7 }, + { AV_CODEC_ID_PCM_ALAW, 27 }, + { AV_CODEC_ID_NONE, 0 }, }; -/* 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, (uint32_t)enc->codec_tag); /* codec ID */ - put_be32(pb, enc->sample_rate); - put_be32(pb, (uint32_t)enc->channels); - return 0; -} - -static int au_write_header(AVFormatContext *s) -{ - ByteIOContext *pb = &s->pb; - - s->priv_data = NULL; - - /* format header */ - if (put_au_header(pb, &s->streams[0]->codec) < 0) { - return -1; - } - - put_flush_packet(pb); - - return 0; -} - -static int au_write_packet(AVFormatContext *s, int stream_index_ptr, - uint8_t *buf, int size, int force_pts) -{ - ByteIOContext *pb = &s->pb; - put_buffer(pb, buf, size); - return 0; -} - -static int au_write_trailer(AVFormatContext *s) -{ - ByteIOContext *pb = &s->pb; - offset_t file_size; - - if (!url_is_streamed(&s->pb)) { - - /* update file size */ - file_size = url_ftell(pb); - url_fseek(pb, 8, SEEK_SET); - put_be32(pb, (uint32_t)(file_size - 24)); - url_fseek(pb, file_size, SEEK_SET); - - put_flush_packet(pb); - } - - return 0; -} +#if CONFIG_AU_DEMUXER 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; @@ -110,99 +55,166 @@ static int au_probe(AVProbeData *p) return 0; } -/* au input */ -static int au_read_header(AVFormatContext *s, - AVFormatParameters *ap) +#define BLOCK_SIZE 1024 + +static int au_read_header(AVFormatContext *s) { int size; unsigned int tag; - ByteIOContext *pb = &s->pb; - unsigned int id, codec, channels, rate; + AVIOContext *pb = s->pb; + unsigned int id, channels, rate; + int bps; + enum AVCodecID codec; AVStream *st; - /* check ".snd" header */ - tag = get_le32(pb); + tag = avio_rl32(pb); if (tag != MKTAG('.', 's', 'n', 'd')) - 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) { + return AVERROR_INVALIDDATA; + size = avio_rb32(pb); /* header size */ + avio_rb32(pb); /* data size */ + + id = avio_rb32(pb); + rate = avio_rb32(pb); + channels = avio_rb32(pb); + + if (size > 24) { /* skip unused data */ - url_fseek(pb, size - 24, SEEK_CUR); + avio_skip(pb, size - 24); + } + + codec = ff_codec_get_id(codec_au_tags, id); + + if (codec == AV_CODEC_ID_NONE) { + avpriv_request_sample(s, "unknown or unsupported codec tag: %u", id); + return AVERROR_PATCHWELCOME; } - /* now we are ready: build format streams */ - st = av_new_stream(s, 0); + bps = av_get_bits_per_sample(codec); + if (!bps) { + avpriv_request_sample(s, "Unknown bits per sample"); + return AVERROR_PATCHWELCOME; + } + + if (channels == 0 || channels >= INT_MAX / (BLOCK_SIZE * bps >> 3)) { + av_log(s, AV_LOG_ERROR, "Invalid number of channels %u\n", channels); + return AVERROR_INVALIDDATA; + } + + if (rate == 0 || rate > INT_MAX) { + av_log(s, AV_LOG_ERROR, "Invalid sample rate: %u\n", rate); + return AVERROR_INVALIDDATA; + } + + st = avformat_new_stream(s, NULL); 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; + return AVERROR(ENOMEM); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_tag = id; + st->codec->codec_id = codec; + st->codec->channels = channels; + st->codec->sample_rate = rate; + st->codec->bit_rate = channels * rate * bps; + st->codec->block_align = channels * bps >> 3; + + st->start_time = 0; + avpriv_set_pts_info(st, 64, 1, rate); + return 0; } -#define MAX_SIZE 4096 - -static int au_read_packet(AVFormatContext *s, - AVPacket *pkt) +static int au_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret; - if (url_feof(&s->pb)) - return -EIO; - if (av_new_packet(pkt, MAX_SIZE)) - return -EIO; + ret = av_get_packet(s->pb, pkt, BLOCK_SIZE * + s->streams[0]->codec->block_align); + if (ret < 0) + return ret; + pkt->stream_index = 0; + pkt->duration = ret / s->streams[0]->codec->block_align; - 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) +AVInputFormat ff_au_demuxer = { + .name = "au", + .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), + .read_probe = au_probe, + .read_header = au_read_header, + .read_packet = au_read_packet, + .read_seek = ff_pcm_read_seek, + .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 }, +}; + +#endif /* CONFIG_AU_DEMUXER */ + +#if CONFIG_AU_MUXER + +#include "rawenc.h" + +/* if we don't know the size in advance */ +#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) + +/* AUDIO_FILE header */ +static int put_au_header(AVIOContext *pb, AVCodecContext *enc) { + if (!enc->codec_tag) + return AVERROR(EINVAL); + + ffio_wfourcc(pb, ".snd"); /* magic number */ + avio_wb32(pb, 24); /* header size */ + avio_wb32(pb, AU_UNKNOWN_SIZE); /* data size */ + avio_wb32(pb, enc->codec_tag); /* codec ID */ + avio_wb32(pb, enc->sample_rate); + avio_wb32(pb, enc->channels); + return 0; } -static AVInputFormat au_iformat = { - "au", - "SUN AU Format", - 0, - au_probe, - au_read_header, - au_read_packet, - au_read_close, -}; +static int au_write_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + int ret; -static AVOutputFormat au_oformat = { - "au", - "SUN AU Format", - "audio/basic", - "au", - 0, - CODEC_ID_PCM_S16BE, - CODEC_ID_NONE, - au_write_header, - au_write_packet, - au_write_trailer, -}; + s->priv_data = NULL; + + if ((ret = put_au_header(pb, s->streams[0]->codec)) < 0) + return ret; + + avio_flush(pb); + + return 0; +} -int au_init(void) +static int au_write_trailer(AVFormatContext *s) { - av_register_input_format(&au_iformat); - av_register_output_format(&au_oformat); + AVIOContext *pb = s->pb; + int64_t file_size; + + if (s->pb->seekable) { + /* update file size */ + file_size = avio_tell(pb); + avio_seek(pb, 8, SEEK_SET); + avio_wb32(pb, (uint32_t)(file_size - 24)); + avio_seek(pb, file_size, SEEK_SET); + avio_flush(pb); + } + return 0; } + +AVOutputFormat ff_au_muxer = { + .name = "au", + .long_name = NULL_IF_CONFIG_SMALL("Sun AU"), + .mime_type = "audio/basic", + .extensions = "au", + .audio_codec = AV_CODEC_ID_PCM_S16BE, + .video_codec = AV_CODEC_ID_NONE, + .write_header = au_write_header, + .write_packet = ff_raw_write_packet, + .write_trailer = au_write_trailer, + .codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 }, +}; + +#endif /* CONFIG_AU_MUXER */