hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add codec/resolution/framerate information to HLS index

Browse source 
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h
This commit is contained in:
Thulinma 2018-04-23 11:07:26 +02:00
parent 807324f133
commit 9d93d78b8b
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/output/output_hls.cpp
View file

@ -23,6 +23,19 @@ namespace Mist {
return r.str(); return r.str();
} }
std::string OutHLS::h265init(const std::string & initData){
std::stringstream r;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[1] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[6] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[7] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[8] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[9] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[10] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[11] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[12] << std::dec;
return r.str();
}
///\brief Builds an index file for HTTP Live streaming. ///\brief Builds an index file for HTTP Live streaming.
///\return The index file for HTTP Live Streaming. ///\return The index file for HTTP Live Streaming.
std::string OutHLS::liveIndex() { std::string OutHLS::liveIndex() {
@ -58,16 +71,23 @@ namespace Mist {
if (it->second.fpks){ if (it->second.fpks){
result << ",FRAME-RATE=" << (float)it->second.fpks / 1000; result << ",FRAME-RATE=" << (float)it->second.fpks / 1000;
} }
if (it->second.codec == "H264"){ if (hasSubs){
result << ",SUBTITLES=\"sub1\"";
}
if (it->second.codec == "H264" || it->second.codec == "H256"){
result << ",CODECS=\""; result << ",CODECS=\"";
if (it->second.codec == "H264"){ if (it->second.codec == "H264"){
result << "avc1." << h264init(it->second.init); result << "avc1." << h264init(it->second.init);
}else{
result << "hev1." << h265init(it->second.init);
} }
if (audioId != -1){ if (audioId != -1){
if (myMeta.tracks[audioId].codec == "AAC"){ if (myMeta.tracks[audioId].codec == "AAC"){
result << ",mp4a.40.2"; result << ",mp4a.40.2";
}else if (myMeta.tracks[audioId].codec == "MP3" ){ }else if (myMeta.tracks[audioId].codec == "MP3" ){
result << ",mp4a.40.34"; result << ",mp4a.40.34";
}else if (myMeta.tracks[audioId].codec == "AC3" ){
result << ",ec-3";
} }
} }
result << "\""; result << "\"";
@ -93,6 +113,8 @@ namespace Mist {
result << ",CODECS=\"mp4a.40.2\""; result << ",CODECS=\"mp4a.40.2\"";
}else if (myMeta.tracks[audioId].codec == "MP3" ){ }else if (myMeta.tracks[audioId].codec == "MP3" ){
result << ",CODECS=\"mp4a.40.34\""; result << ",CODECS=\"mp4a.40.34\"";
}else if (myMeta.tracks[audioId].codec == "AC3" ){
result << ",CODECS=\"ec-3\"";
} }
result << "\r\n"; result << "\r\n";
result << audioId << "/index.m3u8\r\n"; result << audioId << "/index.m3u8\r\n";
@ -196,7 +218,15 @@ namespace Mist {
} }
char lineBuf[400]; char lineBuf[400];
if(myMeta.tracks[tid].codec == "subtitle"){
snprintf(lineBuf, 400, "#EXTINF:%f,\r\n../../../%s.vtt?track=%d&from=%lld&to=%lld\r\n", (double)duration/1000,streamName.c_str(),tid, starttime, starttime + duration);
}else{
if (sessId.size()){
snprintf(lineBuf, 400, "#EXTINF:%f,\r\n%lld_%lld.ts?sessId=%s\r\n", (double)duration/1000, starttime, starttime + duration, sessId.c_str());
}else{
snprintf(lineBuf, 400, "#EXTINF:%f,\r\n%lld_%lld.ts\r\n", (double)duration/1000, starttime, starttime + duration); snprintf(lineBuf, 400, "#EXTINF:%f,\r\n%lld_%lld.ts\r\n", (double)duration/1000, starttime, starttime + duration);
}
}
durs.push_back(duration); durs.push_back(duration);
total_dur += duration; total_dur += duration;
lines.push_back(lineBuf); lines.push_back(lineBuf);

1
src/output/output_hls.h
View file

@ -13,6 +13,7 @@ namespace Mist {
bool isReadyForPlay(); bool isReadyForPlay();
protected: protected:
std::string h264init(const std::string & initData); std::string h264init(const std::string & initData);
std::string h265init(const std::string & initData);
bool hasSessionIDs(){return true;} bool hasSessionIDs(){return true;}
std::string liveIndex(); std::string liveIndex();