mplayer.hg: libmpdemux/demux_mkv.cpp comparison

comparison libmpdemux/demux_mkv.cpp @ 10685:f54ffeb29447

Support for linked seek heads, multiple seek heads, multiple cues.

author	mosu
date	Sun, 24 Aug 2003 12:34:42 +0000
parents	99eb26749a14
children	4079bc9b15f9

comparison

equal deleted inserted replaced

-:99eb26749a14
+:f54ffeb29447
 #include "../subreader.h"
 #include "../libvo/sub.h"
 }
-#include <iostream>
-#include <cassert>
-#include <typeinfo>
 #include <vector>
 #include <ebml/EbmlHead.h>
 #include <ebml/EbmlSubHead.h>
 #include <ebml/EbmlStream.h>
 mkv_track_index_t *index;
 int num_indexes, cues_found, cues_searched;
 int64_t *cluster_positions;
 int num_cluster_pos;
+vector<uint64_t> *parsed_seekheads;
+vector<uint64_t> *parsed_cues;
 int64_t skip_to_timecode;
 bool v_skip_to_keyframe, a_skip_to_keyframe;
 } mkv_demuxer_t;
 mkv_d->num_cluster_pos++;
 } else
 mkv_d->num_cluster_pos = 0;
 }
+static int find_in_vector(vector<uint64_t> &vec, uint64_t value) {
+unsigned int i;
+for (i = 0; i < vec.size(); i++)
+if (vec[i] == value)
+return 1;
+return 0;
+}
 #define in_parent(p) (mkv_d->in->getFilePointer() < \
 (p->GetElementPosition() + p->ElementSize()))
 #define FINDFIRST(p, c) (static_cast<c *> \
 (((EbmlMaster *)p)->FindFirstElt(c::ClassInfos, false)))
 #define FINDNEXT(p, c, e) (static_cast<c *> \
 (((EbmlMaster *)p)->FindNextElt(*e, false)))
-static int parse_cues(mkv_demuxer_t *mkv_d) {
+static void parse_cues(mkv_demuxer_t *mkv_d, uint64_t pos) {
 EbmlElement *l2 = NULL;
 EbmlStream *es;
 KaxCues *cues;
 KaxCuePoint *cpoint;
 KaxCueTime *ctime;
 int upper_lvl_el, i, k;
 uint64_t tc_scale, filepos = 0, timecode = 0;
 uint32_t tnum = 0;
 mkv_index_entry_t *entry;
+if (find_in_vector(*mkv_d->parsed_cues, pos))
+return;
+mkv_d->parsed_cues->push_back(pos);
+mkv_d->in->setFilePointer(pos);
 es = mkv_d->es;
 tc_scale = mkv_d->tc_scale;
 upper_lvl_el = 0;
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing cues ] -----------\n");
 cues = (KaxCues *)es->FindNextElement(mkv_d->segment->Generic().Context,
 upper_lvl_el, 0xFFFFFFFFL, true, 1);
 if (cues == NULL)
-return 0;
+return;
 if (!(EbmlId(*cues) == KaxCues::ClassInfos.GlobalId)) {
-mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] No KaxCues element found but but %s.\n"
+mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] No KaxCues element found but %s.\n"
 "[mkv] \\---- [ parsing cues ] -----------\n",
 cues->Generic().DebugName);
-return 0;
+return;
 }
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ found cues\n");
 cues->Read(*es, KaxCues::ClassInfos.Context, upper_lvl_el, l2, true);
 }
 }
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing cues ] -----------\n");
-return 1;
+mkv_d->cues_found = 1;
+}
+static void parse_seekhead(mkv_demuxer_t *mkv_d, uint64_t pos) {
+EbmlElement *l2 = NULL;
+EbmlStream *es;
+KaxSeekHead *kseekhead;
+KaxSeek *kseek;
+KaxSeekID *ksid;
+KaxSeekPosition *kspos;
+int upper_lvl_el, i, k, s, id_found;
+uint64_t seek_pos;
+EbmlId *id;
+EbmlElement *e;
+binary *b;
+if (find_in_vector(*mkv_d->parsed_seekheads, pos))
+return;
+mkv_d->parsed_seekheads->push_back(pos);
+es = mkv_d->es;
+upper_lvl_el = 0;
+mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing seek head ] ---------\n");
+mkv_d->in->setFilePointer(pos);
+kseekhead =
+(KaxSeekHead *)es->FindNextElement(mkv_d->segment->Generic().Context,
+upper_lvl_el, 0xFFFFFFFFL, true, 1);
+if (kseekhead == NULL)
+return;
+if (!(EbmlId(*kseekhead) == KaxSeekHead::ClassInfos.GlobalId)) {
+mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] No KaxSeekead element found but %s.\n"
+"[mkv] \\---- [ parsing seek head ] ---------\n",
+kseekhead->Generic().DebugName);
+return;
+}
+kseekhead->Read(*es, KaxSeekHead::ClassInfos.Context, upper_lvl_el, l2,
+true);
+for (i = 0; i < (int)kseekhead->ListSize(); i++) {
+kseek = (KaxSeek *)(*kseekhead)[i];
+if (!(EbmlId(*kseek) == KaxSeek::ClassInfos.GlobalId))
+continue;
+seek_pos = 0;
+id = NULL;
+for (k = 0; k < (int)kseek->ListSize(); k++) {
+e = (*kseek)[k];
+if (EbmlId(*e) == KaxSeekID::ClassInfos.GlobalId) {
+ksid = (KaxSeekID *)e;
+b = ksid->GetBuffer();
+s = ksid->GetSize();
+if (id != NULL)
+delete id;
+id = new EbmlId(b, s);
+} else if (EbmlId(*e) == KaxSeekPosition::ClassInfos.GlobalId) {
+kspos = (KaxSeekPosition *)e;
+seek_pos = mkv_d->segment->GetGlobalPosition(uint64(*kspos));
+}
+}
+if ((seek_pos != 0) && (id != NULL)) {
+if (*id == KaxSeekHead::ClassInfos.GlobalId)
+parse_seekhead(mkv_d, seek_pos);
+else if (*id == KaxCues::ClassInfos.GlobalId)
+parse_cues(mkv_d, seek_pos);
+}
+if (id != NULL)
+delete id;
+}
+delete kseekhead;
+mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing seek head ] ---------\n");
 }
 extern "C" void print_wave_header(WAVEFORMATEX *h);
 extern "C" int demux_mkv_open(demuxer_t *demuxer) {
 EbmlElement *l0 = NULL, *l1 = NULL, *l2 = NULL;
 EbmlStream *es;
 mkv_track_t *track;
 sh_audio_t *sh_a;
 sh_video_t *sh_v;
-uint64_t seek_pos, current_pos, cues_pos;
+vector<uint64_t> seekheads_to_parse;
-int seek_element_is_cue;
+vector<uint64_t> cues_to_parse;
+int64_t current_pos;
 #ifdef USE_ICONV
 subcp_open();
 #endif
 }
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] + a segment...\n");
 mkv_d->segment = (KaxSegment *)l0;
 mkv_d->tc_scale = MKVD_TIMECODESCALE;
-cues_pos = 0;
+mkv_d->parsed_seekheads = new vector<uint64_t>;
+mkv_d->parsed_cues = new vector<uint64_t>;
 upper_lvl_el = 0;
 exit_loop = 0;
 // We've got our segment, so let's find the tracks
 l1 = es->FindNextElement(l0->Generic().Context, upper_lvl_el, 0xFFFFFFFFL,
 } // while (ktentry != NULL)
 l1->SkipData(*es, l1->Generic().Context);
 } else if (EbmlId(*l1) == KaxSeekHead::ClassInfos.GlobalId) {
+if (!find_in_vector(seekheads_to_parse, l1->GetElementPosition()))
-KaxSeek *kseek;
+seekheads_to_parse.push_back(l1->GetElementPosition());
-KaxSeekID *ksid;
+l1->SkipData(*es, l1->Generic().Context);
-KaxSeekPosition *kspos;
-mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ found seek head\n");
-l1->Read(*es, KaxSeekHead::ClassInfos.Context, upper_lvl_el, l2, true);
-kseek = FINDFIRST(l1, KaxSeek);
-while (kseek != NULL) {
-mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + seek entry\n");
-seek_element_is_cue = 0;
-seek_pos = 0;
-ksid = FINDFIRST(kseek, KaxSeekID);
-if (ksid != NULL) {
-binary *b;
-int s;
-b = ksid->GetBuffer();
-s = ksid->GetSize();
-EbmlId id(b, s);
-if (id == KaxCues::ClassInfos.GlobalId)
-seek_element_is_cue = 1;
-mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |   + seek ID: ");
-for (i = 0; i < s; i++)
-mp_msg(MSGT_DEMUX, MSGL_V, "0x%02x ",
-((unsigned char *)b)[i]);
-mp_msg(MSGT_DEMUX, MSGL_V, "(%s)\n",
-(id == KaxInfo::ClassInfos.GlobalId) ?
-"KaxInfo" :
-(id == KaxCluster::ClassInfos.GlobalId) ?
-"KaxCluster" :
-(id == KaxTracks::ClassInfos.GlobalId) ?
-"KaxTracks" :
-(id == KaxCues::ClassInfos.GlobalId) ?
-"KaxCues" :
-(id == KaxAttachments::ClassInfos.GlobalId) ?
-"KaxAttachments" :
-(id == KaxChapters::ClassInfos.GlobalId) ?
-"KaxChapters" :
-"unknown");
-}
-kspos = FINDFIRST(kseek, KaxSeekPosition);
-if (kspos != NULL) {
-seek_pos = uint64(*kspos);
-mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |   + seek position: %llu\n",
-seek_pos);
-}
-if (!mkv_d->cues_found && (kspos != NULL) &&
-seek_element_is_cue && (s->end_pos != 0))
-cues_pos = mkv_d->segment->GetGlobalPosition(seek_pos);
-kseek = FINDNEXT(l1, KaxSeek, kseek);
-} // while (kseek != NULL)
 } else if ((EbmlId(*l1) == KaxCues::ClassInfos.GlobalId) &&
 !mkv_d->cues_found) {
-// If the cues are up front then by all means read them now!
+if (!find_in_vector(cues_to_parse, l1->GetElementPosition()))
-current_pos = io.getFilePointer();
+cues_to_parse.push_back(l1->GetElementPosition());
-io.setFilePointer(l1->GetElementPosition());
-mkv_d->cues_found = parse_cues(mkv_d);
-stream_reset(s);
 l1->SkipData(*es, l1->Generic().Context);
 } else if (EbmlId(*l1) == KaxCluster::ClassInfos.GlobalId) {
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ found cluster, headers are "
 "parsed completely :)\n");
 free_mkv_demuxer(mkv_d);
 return 0;
 }
 current_pos = io.getFilePointer();
 // Try to find the very first timecode (cluster timecode).
 l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el,
 0xFFFFFFFFL, true, 1);
 if ((l2 != NULL) && !upper_lvl_el &&
 (EbmlId(*l2) == KaxClusterTimecode::ClassInfos.GlobalId)) {
 ctc.ReadData(es->I_O());
 mkv_d->first_tc = uint64(ctc) * mkv_d->tc_scale / 1000000;
 delete l2;
 } else
 mkv_d->first_tc = 0;
+// Parse all cues and seek heads
+for (i = 0; i < (int)cues_to_parse.size(); i++)
+parse_cues(mkv_d, cues_to_parse[i]);
+for (i = 0; i < (int)seekheads_to_parse.size(); i++)
+parse_seekhead(mkv_d, seekheads_to_parse[i]);
 io.setFilePointer(current_pos);
-// If we have found an entry for the cues in the meta seek data but no
-// cues at the front of the file then read them now. This way the
-// timecode scale will have been initialized correctly.
-if (cues_pos && !mkv_d->cues_found) {
-current_pos = io.getFilePointer();
-io.setFilePointer(cues_pos);
-mkv_d->cues_found = parse_cues(mkv_d);
-if (s->eof)
-stream_reset(s);
-io.setFilePointer(current_pos);
-}
 } catch (exception &ex) {
 mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] caught exception\n");
 return 0;
 }
 while (l1 != NULL) {
 if (upper_lvl_el)
 break;
 if (EbmlId(*l1) == KaxCues::ClassInfos.GlobalId) {
-mkv_d->in->setFilePointer(l1->GetElementPosition());
+parse_cues(mkv_d, l1->GetElementPosition());
 delete l1;
-mkv_d->cues_found = parse_cues(mkv_d);
 break;
 } else {
 if (EbmlId(*l1) == KaxCluster::ClassInfos.GlobalId)
 add_cluster_position(mkv_d, l1->GetElementPosition());
 l1->SkipData(static_cast<EbmlStream &>(*mkv_d->es),
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] seek result: target_timecode %lld, "
 "did not find an entry. Calculated target_filspos: %lld\n",
 target_timecode, target_filepos);
 mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] seek found %p (%s).\n",
 mkv_d->saved_l1, mkv_d->saved_l1 == NULL ? "null" :
-typeid(*mkv_d->saved_l1).name());
+mkv_d->saved_l1->Generic().DebugName);
 }
 if (mkv_d->video != NULL)
 mkv_d->v_skip_to_keyframe = true;
 if (rel_seek_secs > 0.0)

Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.cpp @ 10685:f54ffeb29447