X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparseogm.c;h=2cdaac7ec900e1989eaae1439b0717c486d97cc6;hb=844d9e4115af3625123b5e0fc83e450c5abea898;hp=8788e5d410254ad108eefaf71162fc43693cbaab;hpb=9d9f4119bd17cdfb3409dfa2d68252c16444431d;p=ffmpeg

diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 8788e5d4102..2cdaac7ec90 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -23,19 +23,20 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
-#include "ogg2.h"
+#include "oggdec.h"
 #include "riff.h"
 
 static int
 ogm_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];
-    uint8_t *p = os->buf + os->pstart;
+    const uint8_t *p = os->buf + os->pstart;
     uint64_t time_unit;
     uint64_t spu;
     uint32_t default_len;
@@ -51,42 +52,43 @@ ogm_header(AVFormatContext *s, int idx)
         int tag;
         st->codec->codec_type = CODEC_TYPE_VIDEO;
         p += 8;
-        tag = le2me_32(unaligned32(p));
-        st->codec->codec_id = codec_get_bmp_id(tag);
+        tag = bytestream_get_le32(&p);
+        st->codec->codec_id = codec_get_id(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;
-        p[4] = 0;
-        cid = strtol(p, NULL, 16);
-        st->codec->codec_id = codec_get_wav_id(cid);
+        bytestream_get_buffer(&p, acid, 4);
+        acid[4] = 0;
+        cid = strtol(acid, NULL, 16);
+        st->codec->codec_id = codec_get_id(codec_wav_tags, cid);
+        st->need_parsing = AVSTREAM_PARSE_FULL;
     }
 
-    p += 4;
     p += 4;                     /* useless size field */
 
-    time_unit = le2me_64(unaligned64(p));
-    p += 8;
-    spu = le2me_64(unaligned64(p));
-    p += 8;
-    default_len = le2me_32(unaligned32(p));
-    p += 4;
+    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 = le2me_32(unaligned32(p));
-        p += 4;
-        st->codec->height = le2me_32(unaligned32(p));
+        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 = le2me_16(unaligned16(p));
-        p += 2;
+        st->codec->channels = bytestream_get_le16(&p);
         p += 2;                 /* block_align */
-        st->codec->bit_rate = le2me_32(unaligned32(p)) * 8;
+        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;
@@ -98,8 +100,8 @@ ogm_header(AVFormatContext *s, int idx)
 static int
 ogm_dshow_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];
     uint8_t *p = os->buf + os->pstart;
     uint32_t t;
@@ -109,21 +111,21 @@ ogm_dshow_header(AVFormatContext *s, int idx)
     if(*p != 1)
         return 1;
 
-    t = le2me_32(unaligned32(p + 96));
+    t = AV_RL32(p + 96);
 
     if(t == 0x05589f80){
         st->codec->codec_type = CODEC_TYPE_VIDEO;
-        st->codec->codec_id = codec_get_bmp_id(le2me_32(unaligned32(p + 68)));
+        st->codec->codec_id = codec_get_id(codec_bmp_tags, AV_RL32(p + 68));
         st->codec->time_base.den = 10000000;
-        st->codec->time_base.num = le2me_64(unaligned64(p + 164));
-        st->codec->width = le2me_32(unaligned32(p + 176));
-        st->codec->height = le2me_32(unaligned32(p + 180));
+        st->codec->time_base.num = AV_RL64(p + 164);
+        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_id = codec_get_wav_id(le2me_16(unaligned16(p+124)));
-        st->codec->channels = le2me_16(unaligned16(p + 126));
-        st->codec->sample_rate = le2me_32(unaligned32(p + 128));
-        st->codec->bit_rate = le2me_32(unaligned32(p + 132)) * 8;
+        st->codec->codec_id = codec_get_id(codec_wav_tags, AV_RL16(p + 124));
+        st->codec->channels = AV_RL16(p + 126);
+        st->codec->sample_rate = AV_RL32(p + 128);
+        st->codec->bit_rate = AV_RL32(p + 132) * 8;
     }
 
     return 1;
@@ -132,11 +134,14 @@ ogm_dshow_header(AVFormatContext *s, int idx)
 static int
 ogm_packet(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;
     uint8_t *p = os->buf + os->pstart;
     int lb;
 
+    if(*p & 8)
+        os->pflags |= PKT_FLAG_KEY;
+
     lb = ((*p & 2) << 1) | ((*p >> 6) & 3);
     os->pstart += lb + 1;
     os->psize -= lb + 1;
@@ -144,21 +149,28 @@ ogm_packet(AVFormatContext *s, int idx)
     return 0;
 }
 
-ogg_codec_t ogm_video_codec = {
+const struct ogg_codec ff_ogm_video_codec = {
     .magic = "\001video",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-ogg_codec_t ogm_audio_codec = {
+const struct ogg_codec ff_ogm_audio_codec = {
     .magic = "\001audio",
     .magicsize = 6,
     .header = ogm_header,
     .packet = ogm_packet
 };
 
-ogg_codec_t ogm_old_codec = {
+const struct ogg_codec ff_ogm_text_codec = {
+    .magic = "\001text",
+    .magicsize = 5,
+    .header = ogm_header,
+    .packet = ogm_packet
+};
+
+const struct ogg_codec ff_ogm_old_codec = {
     .magic = "\001Direct Show Samples embedded in Ogg",
     .magicsize = 35,
     .header = ogm_dshow_header,