Commit f5bbc438 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: hls: reject subtitles

We have no demuxer for it
parent 11969bc5
......@@ -44,6 +44,8 @@ namespace hls
return StreamFormat(HLSStreamFormat::PACKEDAAC);
else if (tail == "mp2t")
return StreamFormat(HLSStreamFormat::MPEG2TS);
else if (tail == "binary")
return StreamFormat(HLSStreamFormat::UNSUPPORTED);
}
return StreamFormat();
}
......
......@@ -32,10 +32,13 @@ AbstractStreamOutput *HLSStreamOutputFactory::create(demux_t *demux, const Strea
return new HLSPackedStreamOutput(demux, format, "any");
break;
default:
case HLSStreamFormat::UNKNOWN:
case HLSStreamFormat::MPEG2TS:
return new BaseStreamOutput(demux, format, "ts");
case HLSStreamFormat::UNSUPPORTED:
default:
break;
}
return NULL;
}
......
......@@ -397,6 +397,13 @@ M3U8 * M3U8Parser::parse(stream_t *p_stream, const std::string &playlisturl)
if(pair.second->getAttributeByName("NAME"))
altAdaptSet->description.Set(pair.second->getAttributeByName("NAME")->quotedString());
/* Subtitles unsupported for now */
if(pair.second->getAttributeByName("TYPE")->value != "AUDIO" &&
pair.second->getAttributeByName("TYPE")->value != "VIDEO")
{
rep->setMimeType("application/binary");
}
if(pair.second->getAttributeByName("LANGUAGE"))
{
std::string lang = pair.second->getAttributeByName("LANGUAGE")->quotedString();
......
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