flac in ogg support

based on patch by Matthieu Castet <castet dot matthieu at free dot fr>

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

libavformat/Makefile

@@ -17,7 +17,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
       yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
       sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o \
-      ogg2.o oggparsevorbis.o oggparsetheora.o
+      ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o
 AMROBJS=
 ifeq ($(AMR_NB),yes)
 AMROBJS= amr.o

libavformat/ogg2.c

@@ -40,6 +40,7 @@
 static ogg_codec_t *ogg_codecs[] = {
     &vorbis_codec,
     &theora_codec,
+    &flac_codec,
     NULL
 };
 

libavformat/ogg2.h

@@ -75,11 +75,11 @@ typedef struct ogg {
 
 extern ogg_codec_t vorbis_codec;
 extern ogg_codec_t theora_codec;
+extern ogg_codec_t flac_codec;
 #if 0
 extern ogg_codec_t ogm_video_codec;
 extern ogg_codec_t ogm_audio_codec;
 extern ogg_codec_t ogm_old_codec;
-extern ogg_codec_t flac_codec;
 #endif
 
 extern int vorbis_comment(AVFormatContext *ms, char *buf, int size);

libavformat/oggparseflac.c

+/*
+ *    Copyright (C) 2005  Matthieu CASTET
+ * 
+ * This library 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.
+ *
+ * This library 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
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdlib.h>
+#include "avformat.h"
+#include "bitstream.h"
+#include "ogg2.h"
+
+#define FLAC_STREAMINFO_SIZE 0x22
+
+static int
+flac_header (AVFormatContext * s, int idx)
+{
+    ogg_t *ogg = s->priv_data;
+    ogg_stream_t *os = ogg->streams + idx;
+    AVStream *st = s->streams[idx];
+    GetBitContext gb;
+    int mdt;
+
+    if (os->buf[os->pstart] == 0xff)
+        return 0;
+
+    init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
+    get_bits(&gb, 1); /* metadata_last */
+    mdt = get_bits(&gb, 7);
+
+    if (mdt == 0x7f) {
+        skip_bits(&gb, 4*8); /* "FLAC" */
+        if(get_bits(&gb, 8) != 1) /* unsupported major version */
+            return -1;
+        skip_bits(&gb, 8 + 16);      /* minor version + header count */
+        skip_bits(&gb, 4*8); /* "fLaC" */
+    
+        /* METADATA_BLOCK_HEADER */
+        if (get_bits(&gb, 32) != FLAC_STREAMINFO_SIZE)
+            return -1;
+
+        skip_bits(&gb, 16*2+24*2);
+
+        st->codec.sample_rate = get_bits_long(&gb, 20);
+        st->codec.channels = get_bits(&gb, 3) + 1;
+    
+        st->codec.codec_type = CODEC_TYPE_AUDIO;
+        st->codec.codec_id = CODEC_ID_FLAC;
+
+        st->codec.extradata =
+            av_malloc(FLAC_STREAMINFO_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
+        memcpy (st->codec.extradata, os->buf + os->pstart + 5 + 4 + 4 + 4,
+                FLAC_STREAMINFO_SIZE);
+        st->codec.extradata_size = FLAC_STREAMINFO_SIZE;
+    } else if (mdt == 4) {
+        vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
+    }
+
+    return 1;
+}
+
+ogg_codec_t flac_codec = {
+    .magic = "\177FLAC",
+    .magicsize = 5,
+    .header = flac_header
+};