demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451

[ffmpeg] / libavformat / oggparseogm.c

diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index e263e34c0bf13e935574810b2661bf2f4f368557..6067f95d1147b89a5a2795542e7ed9b7957093d3 100644 (file)
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -23,11 +23,11 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "intreadwrite.h"
-#include "ogg2.h"
+#include "oggdec.h"
 #include "riff.h"
 
 static int
@@ -36,7 +36,7 @@ ogm_header(AVFormatContext *s, int idx)
     ogg_t *ogg = s->priv_data;
     ogg_stream_t *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;
@@ -53,8 +53,12 @@ ogm_header(AVFormatContext *s, int idx)
         st->codec->codec_type = CODEC_TYPE_VIDEO;
         p += 8;
         tag = bytestream_get_le32(&p);
-        st->codec->codec_id = codec_get_bmp_id(tag);
+        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;
@@ -63,7 +67,7 @@ ogm_header(AVFormatContext *s, int idx)
         bytestream_get_buffer(&p, acid, 4);
         acid[4] = 0;
         cid = strtol(acid, NULL, 16);
-        st->codec->codec_id = codec_get_wav_id(cid);
+        st->codec->codec_id = codec_get_id(codec_wav_tags, cid);
     }
 
     p += 4;                     /* useless size field */
@@ -110,14 +114,14 @@ ogm_dshow_header(AVFormatContext *s, int idx)
 
     if(t == 0x05589f80){
         st->codec->codec_type = CODEC_TYPE_VIDEO;
-        st->codec->codec_id = codec_get_bmp_id(AV_RL32(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 = 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(AV_RL16(p + 124));
+        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;
@@ -134,6 +138,9 @@ ogm_packet(AVFormatContext *s, int 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;
@@ -155,6 +162,13 @@ ogg_codec_t ogm_audio_codec = {
     .packet = ogm_packet
 };
 
+ogg_codec_t ogm_text_codec = {
+    .magic = "\001text",
+    .magicsize = 5,
+    .header = ogm_header,
+    .packet = ogm_packet
+};
+
 ogg_codec_t ogm_old_codec = {
     .magic = "\001Direct Show Samples embedded in Ogg",
     .magicsize = 35,