Change all functions referenced in the mxf_metadata_read_table to use the same

[ffmpeg] / libavformat / oggparseflac.c

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 802453adf8e19dcd7fcc47cf5fabf4b9156afe5d..e5034af3a033c0ed51aa26e5c160250b6b4431df 100644 (file)
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -19,11 +19,12 @@
  */
 
 #include <stdlib.h>
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.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)
@@ -32,6 +33,7 @@ flac_header (AVFormatContext * s, int idx)
     struct ogg_stream *os = ogg->streams + idx;
     AVStream *st = s->streams[idx];
     GetBitContext gb;
+    FLACStreaminfo si;
     int mdt;
 
     if (os->buf[os->pstart] == 0xff)
@@ -41,7 +43,8 @@ flac_header (AVFormatContext * s, int idx)
     skip_bits1(&gb); /* metadata_last */
     mdt = get_bits(&gb, 7);
 
-    if (mdt == 0x7f) {
+    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;
@@ -52,24 +55,20 @@ flac_header (AVFormatContext * s, int idx)
         if (get_bits_long(&gb, 32) != FLAC_STREAMINFO_SIZE)
             return -1;
 
-        skip_bits_long(&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_type = AVMEDIA_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) {
-        vorbis_comment (s, os->buf + os->pstart + 4, os->psize - 4);
+    } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
+        ff_vorbis_comment (s, &st->metadata, os->buf + os->pstart + 4, os->psize - 4);
     }
 
     return 1;
@@ -79,7 +78,7 @@ static int
 old_flac_header (AVFormatContext * s, int idx)
 {
     AVStream *st = s->streams[idx];
-    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_FLAC;
 
     return 0;