[Ffmpeg-cvslog] CVS: ffmpeg/libavformat oggparseflac.c, NONE, 1.1 Makefile, 1.88, 1.89 ogg2.c, 1.5, 1.6 ogg2.h, 1.3, 1.4

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv7576

Modified Files:
	Makefile ogg2.c ogg2.h 
Added Files:
	oggparseflac.c 
Log Message:
flac in ogg support
based on patch by Matthieu Castet <castet dot matthieu at free dot fr>


--- NEW FILE: 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
};

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- Makefile	11 May 2005 16:38:34 -0000	1.88
+++ Makefile	11 May 2005 22:47:26 -0000	1.89
@@ -17,7 +17,7 @@
       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

Index: ogg2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg2.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ogg2.c	11 May 2005 16:38:34 -0000	1.5
+++ ogg2.c	11 May 2005 22:47:26 -0000	1.6
@@ -40,6 +40,7 @@
 static ogg_codec_t *ogg_codecs[] = {
     &vorbis_codec,
     &theora_codec,
+    &flac_codec,
     NULL
 };
 

Index: ogg2.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ogg2.h	11 May 2005 16:38:34 -0000	1.3
+++ ogg2.h	11 May 2005 22:47:26 -0000	1.4
@@ -75,11 +75,11 @@
 
 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);