X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fau.c;h=cb1c31dc18256a7ea451077a7521f80ded1f6446;hb=7d87d56ff810b921537138f91048a932065260a1;hp=f4762607e7c7598863c18bdd1533a6fb6394d565;hpb=d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a;p=ffmpeg

diff --git a/libavformat/au.c b/libavformat/au.c
index f4762607e7c..cb1c31dc182 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -1,19 +1,21 @@
 /*
- * AU encoder and decoder
- * Copyright (c) 2001 Fabrice Bellard.
+ * 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
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -26,31 +28,34 @@
  */
 
 #include "avformat.h"
-#include "allformats.h"
-#include "avi.h"
+#include "pcm.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 },
+    { CODEC_ID_NONE, 0 },
 };
 
-#ifdef CONFIG_MUXERS
+#if CONFIG_AU_MUXER
 /* 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);
@@ -59,7 +64,7 @@ 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;
 
@@ -75,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;
-    offset_t file_size;
+    ByteIOContext *pb = s->pb;
+    int64_t file_size;
 
-    if (!url_is_streamed(&s->pb)) {
+    if (!url_is_streamed(s->pb)) {
 
         /* update file size */
         file_size = url_ftell(pb);
@@ -98,13 +103,11 @@ static int au_write_trailer(AVFormatContext *s)
 
     return 0;
 }
-#endif //CONFIG_MUXERS
+#endif /* CONFIG_AU_MUXER */
 
 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;
@@ -118,8 +121,9 @@ static int au_read_header(AVFormatContext *s,
 {
     int size;
     unsigned int tag;
-    ByteIOContext *pb = &s->pb;
-    unsigned int id, codec, channels, rate;
+    ByteIOContext *pb = s->pb;
+    unsigned int id, channels, rate;
+    enum CodecID codec;
     AVStream *st;
 
     /* check ".snd" header */
@@ -133,7 +137,12 @@ static int au_read_header(AVFormatContext *s,
     rate = get_be32(pb);
     channels = get_be32(pb);
 
-    codec = codec_get_id(codec_au_tags, id);
+    codec = ff_codec_get_id(codec_au_tags, id);
+
+    if (!av_get_bits_per_sample(codec)) {
+        av_log_ask_for_sample(s, "could not determine bits per sample\n");
+        return AVERROR_INVALIDDATA;
+    }
 
     if (size >= 24) {
         /* skip unused data */
@@ -144,7 +153,7 @@ 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_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_tag = id;
     st->codec->codec_id = codec;
     st->codec->channels = channels;
@@ -153,18 +162,18 @@ static int au_read_header(AVFormatContext *s,
     return 0;
 }
 
-#define MAX_SIZE 4096
+#define BLOCK_SIZE 1024
 
 static int au_read_packet(AVFormatContext *s,
                           AVPacket *pkt)
 {
     int ret;
 
-    if (url_feof(&s->pb))
-        return AVERROR_IO;
-    ret= av_get_packet(&s->pb, pkt, MAX_SIZE);
+    ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
+                       s->streams[0]->codec->channels *
+                       av_get_bits_per_sample(s->streams[0]->codec->codec_id) >> 3);
     if (ret < 0)
-        return AVERROR_IO;
+        return ret;
     pkt->stream_index = 0;
 
     /* note: we need to modify the packet size here to handle the last
@@ -173,26 +182,24 @@ static int au_read_packet(AVFormatContext *s,
     return 0;
 }
 
-static int au_read_close(AVFormatContext *s)
-{
-    return 0;
-}
-
-static AVInputFormat au_demuxer = {
+#if 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* const []){codec_au_tags, 0},
 };
+#endif
 
-#ifdef CONFIG_MUXERS
-static AVOutputFormat au_muxer = {
+#if CONFIG_AU_MUXER
+AVOutputFormat au_muxer = {
     "au",
-    "SUN AU Format",
+    NULL_IF_CONFIG_SMALL("SUN AU format"),
     "audio/basic",
     "au",
     0,
@@ -201,14 +208,6 @@ static AVOutputFormat au_muxer = {
     au_write_header,
     au_write_packet,
     au_write_trailer,
+    .codec_tag= (const AVCodecTag* const []){codec_au_tags, 0},
 };
-#endif //CONFIG_MUXERS
-
-int au_init(void)
-{
-    av_register_input_format(&au_demuxer);
-#ifdef CONFIG_MUXERS
-    av_register_output_format(&au_muxer);
-#endif //CONFIG_MUXERS
-    return 0;
-}
+#endif //CONFIG_AU_MUXER