X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparseflac.c;h=875f1844c548f1f6644416f69161f440ea5547a6;hb=929e9de7a1cfbc99b62008368c7ac2eae4aae91d;hp=7a0084e7fbeb17ea43da2c62bcfe9f5d342cbda2;hpb=cd34bc76174397712fc0b2502d550a45dd25c11c;p=ffmpeg

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 7a0084e7fbe..875f1844c54 100644
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -20,55 +20,54 @@
 
 #include <stdlib.h>
 #include "libavcodec/bitstream.h"
+#include "libavcodec/flac.h"
 #include "avformat.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_long(&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;
+        ff_flac_parse_streaminfo(st->codec, &si, streaminfo_start);
 
         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);
+        memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
         st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
 
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
-    } else if (mdt == 4) {
+    } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
         vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
     }
 
@@ -85,13 +84,13 @@ old_flac_header (AVFormatContext * s, int idx)
     return 0;
 }
 
-const ogg_codec_t flac_codec = {
+const struct ogg_codec ff_flac_codec = {
     .magic = "\177FLAC",
     .magicsize = 5,
     .header = flac_header
 };
 
-const ogg_codec_t old_flac_codec = {
+const struct ogg_codec ff_old_flac_codec = {
     .magic = "fLaC",
     .magicsize = 4,
     .header = old_flac_header