1 files changed, 28 insertions, 20 deletions

diff --git a/libavformat/au.c b/libavformat/au.c
index d88ccfc5e2..1fdaa9a822 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -2,20 +2,20 @@
  * AU muxer and demuxer
  * Copyright (c) 2001 Fabrice Bellard
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.1 of the License, or (at your option) any later version.
  *
- * Libav 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 Libav; 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
  */
 
@@ -32,6 +32,11 @@
 #include "avio_internal.h"
 #include "pcm.h"
 
+/* if we don't know the size in advance */
+#define AU_UNKNOWN_SIZE ((uint32_t)(~0))
+/* the specification requires an annotation field of at least eight bytes */
+#define AU_HEADER_SIZE (24+8)
+
 static const AVCodecTag codec_au_tags[] = {
     { AV_CODEC_ID_PCM_MULAW,  1 },
     { AV_CODEC_ID_PCM_S8,     2 },
@@ -40,6 +45,7 @@ static const AVCodecTag codec_au_tags[] = {
     { AV_CODEC_ID_PCM_S32BE,  5 },
     { AV_CODEC_ID_PCM_F32BE,  6 },
     { AV_CODEC_ID_PCM_F64BE,  7 },
+    { AV_CODEC_ID_ADPCM_G722,24 },
     { AV_CODEC_ID_PCM_ALAW,  27 },
     { AV_CODEC_ID_NONE,       0 },
 };
@@ -59,7 +65,7 @@ static int au_probe(AVProbeData *p)
 
 static int au_read_header(AVFormatContext *s)
 {
-    int size;
+    int size, data_size = 0;
     unsigned int tag;
     AVIOContext *pb = s->pb;
     unsigned int id, channels, rate;
@@ -69,9 +75,14 @@ static int au_read_header(AVFormatContext *s)
 
     tag = avio_rl32(pb);
     if (tag != MKTAG('.', 's', 'n', 'd'))
-        return -1;
+        return AVERROR_INVALIDDATA;
     size = avio_rb32(pb); /* header size */
-    avio_rb32(pb);        /* data size */
+    data_size = avio_rb32(pb); /* data size in bytes */
+
+    if (data_size < 0 && data_size != AU_UNKNOWN_SIZE) {
+        av_log(s, AV_LOG_ERROR, "Invalid negative data size '%d' found\n", data_size);
+        return AVERROR_INVALIDDATA;
+    }
 
     id       = avio_rb32(pb);
     rate     = avio_rb32(pb);
@@ -107,14 +118,16 @@ static int au_read_header(AVFormatContext *s)
 
     st = avformat_new_stream(s, NULL);
     if (!st)
-        return -1;
+        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->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1);
+    if (data_size != AU_UNKNOWN_SIZE)
+    st->duration = (((int64_t)data_size)<<3) / (st->codec->channels * (int64_t)bps);
 
     st->start_time = 0;
     avpriv_set_pts_info(st, 64, 1, rate);
@@ -153,9 +166,6 @@ AVInputFormat ff_au_demuxer = {
 
 #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)
 {
@@ -163,11 +173,12 @@ static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
         return -1;
 
     ffio_wfourcc(pb, ".snd");                   /* magic number */
-    avio_wb32(pb, 24);                          /* header size */
+    avio_wb32(pb, AU_HEADER_SIZE);              /* header size */
     avio_wb32(pb, AU_UNKNOWN_SIZE);             /* data size */
     avio_wb32(pb, (uint32_t)enc->codec_tag);    /* codec ID */
     avio_wb32(pb, enc->sample_rate);
     avio_wb32(pb, (uint32_t)enc->channels);
+    avio_wb64(pb, 0); /* annotation field */
 
     return 0;
 }
@@ -176,10 +187,8 @@ static int au_write_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
 
-    s->priv_data = NULL;
-
     if (put_au_header(pb, s->streams[0]->codec) < 0)
-        return -1;
+        return AVERROR(EINVAL);
 
     avio_flush(pb);
 
@@ -189,13 +198,12 @@ static int au_write_header(AVFormatContext *s)
 static int au_write_trailer(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
-    int64_t file_size;
+    int64_t file_size = avio_tell(pb);
 
-    if (s->pb->seekable) {
+    if (s->pb->seekable && file_size < INT32_MAX) {
         /* update file size */
-        file_size = avio_tell(pb);
         avio_seek(pb, 8, SEEK_SET);
-        avio_wb32(pb, (uint32_t)(file_size - 24));
+        avio_wb32(pb, (uint32_t)(file_size - AU_HEADER_SIZE));
         avio_seek(pb, file_size, SEEK_SET);
         avio_flush(pb);
     }