X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparseogm.c;h=d7fc426e6cfac976ffded687c232a57a8abd30ad;hb=85e5b866dca776ba259113604c56136c2c8531b3;hp=f13f8c52422491680903b8c668c1ce75ec315c38;hpb=1a40491ef212869077278b46f74ee92a66809d20;p=ffmpeg

diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index f13f8c52422..d7fc426e6cf 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -27,6 +27,7 @@
 #include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
+#include "internal.h"
 #include "oggdec.h"
 #include "riff.h"
 
@@ -39,59 +40,57 @@ ogm_header(AVFormatContext *s, int idx)
     const uint8_t *p = os->buf + os->pstart;
     uint64_t time_unit;
     uint64_t spu;
-    uint32_t default_len;
 
     if(!(*p & 1))
         return 0;
-    if(*p != 1)
-        return 1;
 
-    p++;
-
-    if(*p == 'v'){
-        int tag;
-        st->codec->codec_type = CODEC_TYPE_VIDEO;
-        p += 8;
-        tag = bytestream_get_le32(&p);
-        st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
-        st->codec->codec_tag = tag;
-    } else if (*p == 't') {
-        st->codec->codec_type = CODEC_TYPE_SUBTITLE;
-        st->codec->codec_id = CODEC_ID_TEXT;
-        p += 12;
-    } else {
-        uint8_t acid[5];
-        int cid;
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
-        p += 8;
-        bytestream_get_buffer(&p, acid, 4);
-        acid[4] = 0;
-        cid = strtol(acid, NULL, 16);
-        st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
-        st->need_parsing = AVSTREAM_PARSE_FULL;
-    }
-
-    p += 4;                     /* useless size field */
-
-    time_unit   = bytestream_get_le64(&p);
-    spu         = bytestream_get_le64(&p);
-    default_len = bytestream_get_le32(&p);
-
-    p += 8;                     /* buffersize + bits_per_sample */
-
-    if(st->codec->codec_type == CODEC_TYPE_VIDEO){
-        st->codec->width = bytestream_get_le32(&p);
-        st->codec->height = bytestream_get_le32(&p);
-        st->codec->time_base.den = spu * 10000000;
-        st->codec->time_base.num = time_unit;
-        st->time_base = st->codec->time_base;
-    } else {
-        st->codec->channels = bytestream_get_le16(&p);
-        p += 2;                 /* block_align */
-        st->codec->bit_rate = bytestream_get_le32(&p) * 8;
-        st->codec->sample_rate = spu * 10000000 / time_unit;
-        st->time_base.num = 1;
-        st->time_base.den = st->codec->sample_rate;
+    if(*p == 1) {
+        p++;
+
+        if(*p == 'v'){
+            int tag;
+            st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+            p += 8;
+            tag = bytestream_get_le32(&p);
+            st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
+            st->codec->codec_tag = tag;
+        } else if (*p == 't') {
+            st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+            st->codec->codec_id = CODEC_ID_TEXT;
+            p += 12;
+        } else {
+            uint8_t acid[5];
+            int cid;
+            st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+            p += 8;
+            bytestream_get_buffer(&p, acid, 4);
+            acid[4] = 0;
+            cid = strtol(acid, NULL, 16);
+            st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid);
+            st->need_parsing = AVSTREAM_PARSE_FULL;
+        }
+
+        p += 4;                     /* useless size field */
+
+        time_unit   = bytestream_get_le64(&p);
+        spu         = bytestream_get_le64(&p);
+        p += 4;                     /* default_len */
+        p += 8;                     /* buffersize + bits_per_sample */
+
+        if(st->codec->codec_type == AVMEDIA_TYPE_VIDEO){
+            st->codec->width = bytestream_get_le32(&p);
+            st->codec->height = bytestream_get_le32(&p);
+            avpriv_set_pts_info(st, 64, time_unit, spu * 10000000);
+        } else {
+            st->codec->channels = bytestream_get_le16(&p);
+            p += 2;                 /* block_align */
+            st->codec->bit_rate = bytestream_get_le32(&p) * 8;
+            st->codec->sample_rate = spu * 10000000 / time_unit;
+            avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+        }
+    } else if (*p == 3) {
+        if (os->psize > 8)
+            ff_vorbis_comment(s, &st->metadata, p+7, os->psize-8);
     }
 
     return 1;
@@ -114,14 +113,13 @@ ogm_dshow_header(AVFormatContext *s, int idx)
     t = AV_RL32(p + 96);
 
     if(t == 0x05589f80){
-        st->codec->codec_type = CODEC_TYPE_VIDEO;
+        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(p + 68));
-        st->codec->time_base.den = 10000000;
-        st->codec->time_base.num = AV_RL64(p + 164);
+        avpriv_set_pts_info(st, 64, AV_RL64(p + 164), 10000000);
         st->codec->width = AV_RL32(p + 176);
         st->codec->height = AV_RL32(p + 180);
     } else if(t == 0x05589f81){
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
+        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, AV_RL16(p + 124));
         st->codec->channels = AV_RL16(p + 126);
         st->codec->sample_rate = AV_RL32(p + 128);
@@ -140,12 +138,15 @@ ogm_packet(AVFormatContext *s, int idx)
     int lb;
 
     if(*p & 8)
-        os->pflags |= PKT_FLAG_KEY;
+        os->pflags |= AV_PKT_FLAG_KEY;
 
     lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
     os->pstart += lb + 1;
     os->psize -= lb + 1;
 
+    while (lb--)
+        os->pduration += p[lb+1] << (lb*8);
+
     return 0;
 }
 
@@ -153,26 +154,30 @@ const struct ogg_codec ff_ogm_video_codec = {
     .magic = "\001video",
     .magicsize = 6,
     .header = ogm_header,
-    .packet = ogm_packet
+    .packet = ogm_packet,
+    .granule_is_start = 1,
 };
 
 const struct ogg_codec ff_ogm_audio_codec = {
     .magic = "\001audio",
     .magicsize = 6,
     .header = ogm_header,
-    .packet = ogm_packet
+    .packet = ogm_packet,
+    .granule_is_start = 1,
 };
 
 const struct ogg_codec ff_ogm_text_codec = {
     .magic = "\001text",
     .magicsize = 5,
     .header = ogm_header,
-    .packet = ogm_packet
+    .packet = ogm_packet,
+    .granule_is_start = 1,
 };
 
 const struct ogg_codec ff_ogm_old_codec = {
     .magic = "\001Direct Show Samples embedded in Ogg",
     .magicsize = 35,
     .header = ogm_dshow_header,
-    .packet = ogm_packet
+    .packet = ogm_packet,
+    .granule_is_start = 1,
 };