* support for .au .gif .mov .mp4 by François Revol <revol@free.fr>

  hmm any opinions about GIF support ?

Originally committed as revision 385 to svn://svn.ffmpeg.org/ffmpeg/trunk

libav/Makefile

@@ -4,7 +4,7 @@ CFLAGS= $(OPTFLAGS) -Wall -g -I../libavcodec -DHAVE_AV_CONFIG_H
 OBJS= rm.o mpeg.o asf.o avienc.o jpeg.o swf.o wav.o raw.o \
 	 avidec.o ffm.o \
 	 avio.o aviobuf.o utils.o \
-	 file.o img.o
+	 file.o img.o au.o gif.o mov.o
 
 ifeq ($(CONFIG_GRAB),yes)
 OBJS+= grab.o audio.o 

libav/au.c

+/* 
+ * AU encoder and decoder
+ * Copyright (c) 2001 Gerard Lantau.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 "avi.h"
+
+/* if we don't know the size in advance */
+#define AU_UNKOWN_SIZE ((UINT32)(~0))
+
+/* The ffmpeg codecs we support, and the IDs they have in the file */
+CodecTag codec_au_tags[] = {
+    { CODEC_ID_PCM_MULAW, 1 },
+    { CODEC_ID_PCM_S16BE, 3 },
+    { CODEC_ID_PCM_ALAW, 27 },
+    { 0, 0 },
+};
+
+/* AUDIO_FILE header */
+int put_au_header(ByteIOContext *pb, AVCodecContext *enc)
+{
+    int tag;
+
+    tag = codec_get_tag(codec_au_tags, enc->codec_id);
+    if (tag == 0)
+        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)tag);     /* codec ID */
+    put_be32(pb, enc->sample_rate);
+    put_be32(pb, (UINT32)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 *buf, int size)
+{
+    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)(file_size - 24));
+        url_fseek(pb, file_size, SEEK_SET);
+
+        put_flush_packet(pb);
+    }
+
+    return 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;
+
+    /* 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 */
+    
+    id = get_be32(pb);
+    rate = get_be32(pb);
+    channels = get_be32(pb);
+    
+    codec = codec_get_id(codec_au_tags, id);
+
+    if (size >= 24) {
+        /* skip unused data */
+        url_fseek(pb, size - 24, SEEK_CUR);
+    }
+
+    /* now we are ready: build format streams */
+    st = malloc(sizeof(AVStream));
+    if (!st)
+        return -1;
+    s->nb_streams = 1;
+    s->streams[0] = st;
+
+    st->id = 0;
+    
+    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 0;
+}
+
+#define MAX_SIZE 4096
+
+static int au_read_packet(AVFormatContext *s,
+                           AVPacket *pkt)
+{
+    int packet_size, n, ret;
+
+    if (url_feof(&s->pb))
+        return -EIO;
+    packet_size = url_get_packet_size(&s->pb);
+    n = MAX_SIZE / packet_size;
+    if (n <= 0)
+        return n = 1;
+    if (av_new_packet(pkt, n * packet_size))
+        return -EIO;
+    pkt->stream_index = 0;
+
+    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 ret;
+}
+
+static int au_read_close(AVFormatContext *s)
+{
+    return 0;
+}
+
+AVFormat au_format = {
+    "au",
+    "SUN AU Format",
+    "audio/basic",
+    "au",
+    CODEC_ID_PCM_S16BE,
+    CODEC_ID_NONE,
+    au_write_header,
+    au_write_packet,
+    au_write_trailer,
+
+    au_read_header,
+    au_read_packet,
+    au_read_close,
+};

libav/avformat.h

@@ -113,6 +113,10 @@ extern AVFormat asf_format;
 /* avienc.c */
 extern AVFormat avi_format;
 
+/* mov.c */
+extern AVFormat mov_format;
+extern AVFormat mp4_format;
+
 /* jpegenc.c */
 extern AVFormat mpjpeg_format;
 extern AVFormat jpeg_format;
@@ -121,6 +125,11 @@ extern AVFormat single_jpeg_format;
 /* swfenc.c */
 extern AVFormat swf_format;
 
+/* gif.c */
+extern AVFormat gif_format;
+/* au.c */
+extern AVFormat au_format;
+
 /* wav.c */
 extern AVFormat wav_format;
 

libav/utils.c

@@ -138,10 +138,14 @@ void register_all(void)
     register_avformat(&rm_format);
     register_avformat(&asf_format);
     register_avformat(&avi_format);
+    register_avformat(&mov_format);
+    register_avformat(&mp4_format);
     register_avformat(&mpjpeg_format);
     register_avformat(&jpeg_format);
     register_avformat(&single_jpeg_format);
     register_avformat(&swf_format);
+    register_avformat(&gif_format);
+    register_avformat(&au_format);
     register_avformat(&wav_format);
     register_avformat(&pcm_s16le_format);
     register_avformat(&pcm_s16be_format);