Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

[ffmpeg] / libavformat / au.c

diff --git a/libavformat/au.c b/libavformat/au.c
index 788e261e708c445fd8935fa043424fb6f6474953..9f95334fc163db6c5c83c145ae6731a7584664ca 100644 (file)
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -31,10 +31,11 @@
 #include "internal.h"
 #include "avio_internal.h"
 #include "pcm.h"
-#include "riff.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)
 
 /* The libavcodec codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_au_tags[] = {
@@ -45,6 +46,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 },
 };
@@ -56,11 +58,12 @@ static int put_au_header(AVIOContext *pb, AVCodecContext *enc)
     if(!enc->codec_tag)
         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;
 }
 
@@ -68,8 +71,6 @@ static int au_write_header(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;
 
-    s->priv_data = NULL;
-
     /* format header */
     if (put_au_header(pb, s->streams[0]->codec) < 0) {
         return -1;
@@ -97,7 +98,7 @@ static int au_write_trailer(AVFormatContext *s)
         /* 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);
@@ -169,39 +170,20 @@ static int au_read_header(AVFormatContext *s)
     st->codec->codec_id = codec;
     st->codec->channels = channels;
     st->codec->sample_rate = rate;
+    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);
     avpriv_set_pts_info(st, 64, 1, rate);
     return 0;
 }
 
-#define BLOCK_SIZE 1024
-
-static int au_read_packet(AVFormatContext *s,
-                          AVPacket *pkt)
-{
-    int ret;
-    int bpcs = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
-
-    if (!bpcs)
-        return AVERROR(EINVAL);
-    ret= av_get_packet(s->pb, pkt, BLOCK_SIZE *
-                       s->streams[0]->codec->channels *
-                       bpcs >> 3);
-    if (ret < 0)
-        return ret;
-    pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
-    pkt->stream_index = 0;
-    return 0;
-}
-
 #if CONFIG_AU_DEMUXER
 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_packet    = ff_pcm_read_packet,
     .read_seek      = ff_pcm_read_seek,
     .codec_tag      = (const AVCodecTag* const []){ codec_au_tags, 0 },
 };