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
This commit is contained in:
Thulinma 2018-04-23 10:48:20 +02:00
parent 662f1cfa9d
commit 06bda0240c
2 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/output/output_hls.cpp
View file

@ -12,6 +12,16 @@ namespace Mist {
return false; return false;
} }
std::string OutHLS::h264init(const std::string & initData){
std::stringstream r;
MP4::AVCC avccBox;
avccBox.setPayload(initData);
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[2] << std::dec;
r << std::hex << std::setw(2) << std::setfill('0') << (int)initData[3] << 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(){
@ -35,7 +45,26 @@ namespace Mist {
if (audioId != -1){ if (audioId != -1){
bWidth += myMeta.tracks[audioId].bps; bWidth += myMeta.tracks[audioId].bps;
} }
result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=" << (bWidth * 8) << "\r\n"; result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=" << (bWidth * 8);
result << ",RESOLUTION=" << it->second.width << "x" << it->second.height;
if (it->second.fpks){
result << ",FRAME-RATE=" << (float)it->second.fpks / 1000;
}
if (it->second.codec == "H264"){
result << ",CODECS=\"";
if (it->second.codec == "H264"){
result << "avc1." << h264init(it->second.init);
}
if (audioId != -1){
if (myMeta.tracks[audioId].codec == "AAC"){
result << ",mp4a.40.2";
}else if (myMeta.tracks[audioId].codec == "MP3" ){
result << ",mp4a.40.34";
}
}
result << "\"";
}
result <<"\r\n";
result << it->first; result << it->first;
if (audioId != -1){ if (audioId != -1){
result << "_" << audioId; result << "_" << audioId;
@ -43,8 +72,14 @@ namespace Mist {
result << "/index.m3u8?sessId=" << getpid() << "\r\n"; result << "/index.m3u8?sessId=" << getpid() << "\r\n";
} }
} }
if (!vidTracks && audioId){ if (!vidTracks && audioId) {
result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=" << (myMeta.tracks[audioId].bps * 8) << "\r\n"; result << "#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=" << (myMeta.tracks[audioId].bps * 8);
if (myMeta.tracks[audioId].codec == "AAC"){
result << ",CODECS=\"mp4a.40.2\"";
}else if (myMeta.tracks[audioId].codec == "MP3" ){
result << ",CODECS=\"mp4a.40.34\"";
}
result << "\r\n";
result << audioId << "/index.m3u8\r\n"; result << audioId << "/index.m3u8\r\n";
} }
DEBUG_MSG(DLVL_HIGH, "Sending this index: %s", result.str().c_str()); DEBUG_MSG(DLVL_HIGH, "Sending this index: %s", result.str().c_str());
@ -68,11 +103,8 @@ namespace Mist {
duration = myMeta.tracks[tid].lastms - starttime; duration = myMeta.tracks[tid].lastms - starttime;
} }
char lineBuf[400]; char lineBuf[400];
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()); snprintf(lineBuf, 400, "#EXTINF:%f,\r\n%lld_%lld.ts\r\n", (double)duration/1000, starttime, starttime + duration);
}else{
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);

2
src/output/output_hls.h
View file

@ -12,6 +12,8 @@ namespace Mist {
void onHTTP(); void onHTTP();
bool isReadyForPlay(); bool isReadyForPlay();
protected: protected:
std::string h264init(const std::string & initData);
bool hasSessionIDs(){return true;} bool hasSessionIDs(){return true;}
std::string liveIndex(); std::string liveIndex();
std::string liveIndex(int tid, std::string & sessId); std::string liveIndex(int tid, std::string & sessId);