X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fau.c;h=20c9d41f47091af366c0666b8d5af75c8b34e39a;hb=fd36cf6bf6524247a8ff6788c028836fe7d9fd20;hp=dd9d708ff5d7b990ee6f4c61be6e14d160ec075c;hpb=7241a6bb5020a05ed5a3dddca28703b912492d2e;p=ffmpeg diff --git a/libavformat/au.c b/libavformat/au.c index dd9d708ff5d..20c9d41f470 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -1,207 +1,221 @@ /* * AU muxer and demuxer - * Copyright (c) 2001 Fabrice Bellard. + * Copyright (c) 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * first version by Francois Revol * - * FFmpeg is free software; you can redistribute it and/or + * This file is part of Libav. + * + * 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.1 of the License, or (at your option) any later version. * - * FFmpeg 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* - * First version by Francois Revol revol@free.fr - * * Reference documents: * http://www.opengroup.org/public/pubs/external/auformat.html * http://www.goice.co.jp/member/mo/formats/au.html */ #include "avformat.h" -#include "raw.h" -#include "riff.h" - -/* if we don't know the size in advance */ -#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) +#include "internal.h" +#include "avio_internal.h" +#include "pcm.h" -/* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_au_tags[] = { - { CODEC_ID_PCM_MULAW, 1 }, - { CODEC_ID_PCM_S16BE, 3 }, - { CODEC_ID_PCM_ALAW, 27 }, - { 0, 0 }, + { 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 }, }; -#ifdef CONFIG_MUXERS -/* AUDIO_FILE header */ -static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) +#if CONFIG_AU_DEMUXER + +static int au_probe(AVProbeData *p) { - if(!enc->codec_tag) - return -1; - put_tag(pb, ".snd"); /* magic number */ - put_be32(pb, 24); /* header 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); - return 0; + if (p->buf[0] == '.' && p->buf[1] == 's' && + p->buf[2] == 'n' && p->buf[3] == 'd') + return AVPROBE_SCORE_MAX; + else + return 0; } -static int au_write_header(AVFormatContext *s) +#define BLOCK_SIZE 1024 + +static int au_read_header(AVFormatContext *s) { - ByteIOContext *pb = &s->pb; + int size; + unsigned int tag; + AVIOContext *pb = s->pb; + unsigned int id, channels, rate; + int bps; + enum AVCodecID codec; + AVStream *st; - s->priv_data = NULL; + tag = avio_rl32(pb); + if (tag != MKTAG('.', 's', 'n', 'd')) + 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); - /* format header */ - if (put_au_header(pb, s->streams[0]->codec) < 0) { - return -1; + if (size > 24) { + /* skip unused data */ + avio_skip(pb, size - 24); } - put_flush_packet(pb); + codec = ff_codec_get_id(codec_au_tags, id); - return 0; -} + if (codec == AV_CODEC_ID_NONE) { + avpriv_request_sample(s, "unknown or unsupported codec tag: %u", id); + return AVERROR_PATCHWELCOME; + } + + 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 AVERROR(ENOMEM); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_tag = id; + st->codecpar->codec_id = codec; + st->codecpar->channels = channels; + st->codecpar->sample_rate = rate; + st->codecpar->bit_rate = channels * rate * bps; + st->codecpar->block_align = channels * bps >> 3; + + st->start_time = 0; + avpriv_set_pts_info(st, 64, 1, rate); -static int au_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - ByteIOContext *pb = &s->pb; - put_buffer(pb, pkt->data, pkt->size); return 0; } -static int au_write_trailer(AVFormatContext *s) +static int au_read_packet(AVFormatContext *s, AVPacket *pkt) { - ByteIOContext *pb = &s->pb; - offset_t file_size; - - if (!url_is_streamed(&s->pb)) { + int ret; - /* 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); + ret = av_get_packet(s->pb, pkt, BLOCK_SIZE * + s->streams[0]->codecpar->block_align); + if (ret < 0) + return ret; - put_flush_packet(pb); - } + pkt->stream_index = 0; + pkt->duration = ret / s->streams[0]->codecpar->block_align; return 0; } -#endif //CONFIG_MUXERS -static int au_probe(AVProbeData *p) -{ - /* check file header */ - if (p->buf[0] == '.' && p->buf[1] == 's' && - p->buf[2] == 'n' && p->buf[3] == 'd') - return AVPROBE_SCORE_MAX; - else - return 0; -} +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 }, +}; -/* au input */ -static int au_read_header(AVFormatContext *s, - AVFormatParameters *ap) -{ - int size; - unsigned int tag; - ByteIOContext *pb = &s->pb; - unsigned int id, codec, channels, rate; - AVStream *st; +#endif /* CONFIG_AU_DEMUXER */ - /* check ".snd" header */ - tag = get_le32(pb); - if (tag != MKTAG('.', 's', 'n', 'd')) - return -1; - size = get_be32(pb); /* header size */ - get_be32(pb); /* data size */ +#if CONFIG_AU_MUXER - id = get_be32(pb); - rate = get_be32(pb); - channels = get_be32(pb); +#include "rawenc.h" - codec = codec_get_id(codec_au_tags, id); +/* if we don't know the size in advance */ +#define AU_UNKNOWN_SIZE ((uint32_t)(~0)) - if (size >= 24) { - /* skip unused data */ - url_fseek(pb, size - 24, SEEK_CUR); - } +/* AUDIO_FILE header */ +static int put_au_header(AVIOContext *pb, AVCodecParameters *par) +{ + if (!par->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, par->codec_tag); /* codec ID */ + avio_wb32(pb, par->sample_rate); + avio_wb32(pb, par->channels); - /* now we are ready: build format streams */ - 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; - av_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_write_header(AVFormatContext *s) { + AVIOContext *pb = s->pb; int ret; - 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; + s->priv_data = NULL; + + if ((ret = put_au_header(pb, s->streams[0]->codecpar)) < 0) + return ret; + + avio_flush(pb); - /* 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) +static int au_write_trailer(AVFormatContext *s) { + AVIOContext *pb = s->pb; + int64_t file_size; + + if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { + /* 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; } -#ifdef CONFIG_AU_DEMUXER -AVInputFormat au_demuxer = { - "au", - "SUN AU Format", - 0, - au_probe, - au_read_header, - au_read_packet, - au_read_close, - pcm_read_seek, - .codec_tag= (const AVCodecTag*[]){codec_au_tags, 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 }, + .flags = AVFMT_NOTIMESTAMPS, }; -#endif - -#ifdef CONFIG_AU_MUXER -AVOutputFormat au_muxer = { - "au", - "SUN AU Format", - "audio/basic", - "au", - 0, - CODEC_ID_PCM_S16BE, - CODEC_ID_NONE, - au_write_header, - au_write_packet, - au_write_trailer, - .codec_tag= (const AVCodecTag*[]){codec_au_tags, 0}, -}; -#endif //CONFIG_AU_MUXER + +#endif /* CONFIG_AU_MUXER */