X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparseflac.c;h=53cd0fa5824ccc2c5f8b879c889b616a03be7a50;hb=727c7aa02642c97b68356d40d1a8e9e835ba1a69;hp=9ad362830d58ff0b61b82607ddac1e42095702f7;hpb=bcfc40aed408e5016dfb9dd009bbbac661a9e197;p=ffmpeg

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 9ad362830d5..53cd0fa5824 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -1,77 +1,96 @@
 /*
  *    Copyright (C) 2005  Matthieu CASTET
- * 
- * This library is free software; you can redistribute it and/or
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdlib.h>
+#include "libavcodec/get_bits.h"
+#include "libavcodec/flac.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "ogg2.h"
+#include "oggdec.h"
 
-#define FLAC_STREAMINFO_SIZE 0x22
+#define OGG_FLAC_METADATA_TYPE_STREAMINFO 0x7F
 
 static int
 flac_header (AVFormatContext * s, int idx)
 {
-    ogg_t *ogg = s->priv_data;
-    ogg_stream_t *os = ogg->streams + idx;
+    struct ogg *ogg = s->priv_data;
+    struct ogg_stream *os = ogg->streams + idx;
     AVStream *st = s->streams[idx];
     GetBitContext gb;
+    FLACStreaminfo si;
     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 */
+    skip_bits1(&gb); /* metadata_last */
     mdt = get_bits(&gb, 7);
 
-    if (mdt == 0x7f) {
-        skip_bits(&gb, 4*8); /* "FLAC" */
+    if (mdt == OGG_FLAC_METADATA_TYPE_STREAMINFO) {
+        uint8_t *streaminfo_start = os->buf + os->pstart + 5 + 4 + 4 + 4;
+        skip_bits_long(&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" */
-    
+        skip_bits_long(&gb, 8 + 16); /* minor version + header count */
+        skip_bits_long(&gb, 4*8); /* "fLaC" */
+
         /* METADATA_BLOCK_HEADER */
-        if (get_bits(&gb, 32) != FLAC_STREAMINFO_SIZE)
+        if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
             return -1;
 
-        skip_bits(&gb, 16*2+24*2);
+        ff_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
 
-        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->codec_type = AVMEDIA_TYPE_AUDIO;
+        st->codec->codec_id = CODEC_ID_FLAC;
 
-        st->codec.extradata =
+        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);
+        memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
+        st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
+
+        av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+    } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
+        ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
     }
 
     return 1;
 }
 
-ogg_codec_t flac_codec = {
+static int
+old_flac_header (AVFormatContext * s, int idx)
+{
+    AVStream *st = s->streams[idx];
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    st->codec->codec_id = CODEC_ID_FLAC;
+
+    return 0;
+}
+
+const struct ogg_codec ff_flac_codec = {
     .magic = "\177FLAC",
     .magicsize = 5,
     .header = flac_header
 };
+
+const struct ogg_codec ff_old_flac_codec = {
+    .magic = "fLaC",
+    .magicsize = 4,
+    .header = old_flac_header
+};