Commit 6cb361c1 authored by François Cartegnie's avatar François Cartegnie 🤞

demux: hls: add basic support for mp4 containers

parent 3a7ecded
...@@ -67,6 +67,10 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format) ...@@ -67,6 +67,10 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format)
ret = new Demuxer(p_realdemux, "ts", fakeesout->getEsOut(), demuxersource); ret = new Demuxer(p_realdemux, "ts", fakeesout->getEsOut(), demuxersource);
break; break;
case StreamFormat::MP4:
ret = new Demuxer(p_realdemux, "mp4", fakeesout->getEsOut(), demuxersource);
break;
default: default:
case StreamFormat::UNSUPPORTED: case StreamFormat::UNSUPPORTED:
break; break;
......
...@@ -88,6 +88,10 @@ void M3U8Parser::setFormatFromExtension(Representation *rep, const std::string & ...@@ -88,6 +88,10 @@ void M3U8Parser::setFormatFromExtension(Representation *rep, const std::string &
{ {
rep->streamFormat = StreamFormat(StreamFormat::MPEG2TS); rep->streamFormat = StreamFormat(StreamFormat::MPEG2TS);
} }
else if(extension == "mp4" || extension == "m4s" || extension == "mov" || extension == "m4v")
{
rep->streamFormat = StreamFormat(StreamFormat::MP4);
}
else else
{ {
rep->streamFormat = StreamFormat(StreamFormat::UNSUPPORTED); rep->streamFormat = StreamFormat(StreamFormat::UNSUPPORTED);
......
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