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

Added HLS protocol option to disable session IDs, merging together all views from a single user into a single session.

Browse source
This commit is contained in:
Thulinma 2018-05-17 22:50:49 +02:00
parent 93f8b01a0b
commit 3b16f03674
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/output/output_hls.cpp
View file

@ -97,7 +97,11 @@ namespace Mist {
if (audioId != -1) {
result << "_" << audioId;
}
result << "/index.m3u8?sessId=" << getpid() << "\r\n";
if (hasSessionIDs()){
result << "/index.m3u8?sessId=" << getpid() << "\r\n";
}else{
result << "/index.m3u8\r\n";
}
}else if(it->second.codec == "subtitle"){
if(it->second.lang.empty()){
@ -373,6 +377,11 @@ namespace Mist {
capa["optional"]["nonchunked"]["name"] = "Send whole segments";
capa["optional"]["nonchunked"]["help"] = "Disables chunked transfer encoding, forcing per-segment buffering. Reduces performance significantly, but increases compatibility somewhat.";
capa["optional"]["nonchunked"]["option"] = "--nonchunked";
cfg->addOption("mergesessions", JSON::fromString("{\"short\":\"M\",\"long\":\"mergesessions\",\"help\":\"Merge together sessions from one user into a single session.\"}"));
capa["optional"]["mergesessions"]["name"] = "Merge sessions";
capa["optional"]["mergesessions"]["help"] = "If enabled, merges together all views from a single user into a single combined session. If disabled, each view (main playlist request) is a separate session.";
capa["optional"]["mergesessions"]["option"] = "--mergesessions";
/*LTS-END*/
}

2
src/output/output_hls.h
View file

@ -15,7 +15,7 @@ namespace Mist {
std::string h264init(const std::string & initData);
std::string h265init(const std::string & initData);
bool hasSessionIDs(){return true;}
bool hasSessionIDs(){return !config->getBool("mergesessions");}
std::string liveIndex();
std::string liveIndex(int tid, std::string & sessId);