Commit e4b5cf60 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: dash: add support for timed text

parent 52ae2e38
...@@ -49,6 +49,10 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format) ...@@ -49,6 +49,10 @@ AbstractDemuxer * DASHStream::createDemux(const StreamFormat &format)
ret = new SlaveDemuxer(p_realdemux, "subtitle", fakeesout->getEsOut(), demuxersource); ret = new SlaveDemuxer(p_realdemux, "subtitle", fakeesout->getEsOut(), demuxersource);
break; break;
case DASHStreamFormat::TTML:
ret = new SlaveDemuxer(p_realdemux, "ttml", fakeesout->getEsOut(), demuxersource);
break;
default: default:
case StreamFormat::UNSUPPORTED: case StreamFormat::UNSUPPORTED:
break; break;
......
...@@ -33,6 +33,7 @@ namespace dash ...@@ -33,6 +33,7 @@ namespace dash
static const unsigned MPEG2TS = StreamFormat::UNSUPPORTED + 1; static const unsigned MPEG2TS = StreamFormat::UNSUPPORTED + 1;
static const unsigned MP4 = StreamFormat::UNSUPPORTED + 2; static const unsigned MP4 = StreamFormat::UNSUPPORTED + 2;
static const unsigned WEBVTT = StreamFormat::UNSUPPORTED + 3; static const unsigned WEBVTT = StreamFormat::UNSUPPORTED + 3;
static const unsigned TTML = StreamFormat::UNSUPPORTED + 4;
static StreamFormat mimeToFormat(const std::string &mime) static StreamFormat mimeToFormat(const std::string &mime)
{ {
...@@ -46,6 +47,8 @@ namespace dash ...@@ -46,6 +47,8 @@ namespace dash
return StreamFormat(DASHStreamFormat::MPEG2TS); return StreamFormat(DASHStreamFormat::MPEG2TS);
else if (tail == "vtt") else if (tail == "vtt")
return StreamFormat(DASHStreamFormat::WEBVTT); return StreamFormat(DASHStreamFormat::WEBVTT);
else if (tail == "ttml+xml")
return StreamFormat(DASHStreamFormat::TTML);
} }
return StreamFormat(); return StreamFormat();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment