Browse Source

demux: dash: add support for timed text

pull/35/head
Francois Cartegnie 11 years ago
parent
commit
e4b5cf608f
  1. 4
      modules/demux/dash/DASHStream.cpp
  2. 3
      modules/demux/dash/DASHStreamFormat.hpp

4
modules/demux/dash/DASHStream.cpp

@ -49,6 +49,10 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
ret = new SlaveDemuxer(p_realdemux, "subtitle", fakeesout->getEsOut(), demuxersource);
break;
case DASHStreamFormat::TTML:
ret = new SlaveDemuxer(p_realdemux, "ttml", fakeesout->getEsOut(), demuxersource);
break;
default:
case StreamFormat::UNSUPPORTED:
break;

3
modules/demux/dash/DASHStreamFormat.hpp

@ -33,6 +33,7 @@ namespace dash
static const unsigned MPEG2TS = StreamFormat::UNSUPPORTED + 1;
static const unsigned MP4 = StreamFormat::UNSUPPORTED + 2;
static const unsigned WEBVTT = StreamFormat::UNSUPPORTED + 3;
static const unsigned TTML = StreamFormat::UNSUPPORTED + 4;
static StreamFormat mimeToFormat(const std::string &mime)
{
@ -46,6 +47,8 @@ namespace dash
return StreamFormat(DASHStreamFormat::MPEG2TS);
else if (tail == "vtt")
return StreamFormat(DASHStreamFormat::WEBVTT);
else if (tail == "ttml+xml")
return StreamFormat(DASHStreamFormat::TTML);
}
return StreamFormat();
}

Loading…
Cancel
Save