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

Removed deprecated startpos option.

Browse source
This commit is contained in:
Thulinma 2016-06-27 13:17:15 +02:00
parent 02ac648bae
commit 6c466d452a
3 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output.cpp
View file

@ -36,12 +36,6 @@ namespace Mist {
capa["optional"]["debug"]["help"] = "The debug level at which messages need to be printed."; capa["optional"]["debug"]["help"] = "The debug level at which messages need to be printed.";
capa["optional"]["debug"]["option"] = "--debug"; capa["optional"]["debug"]["option"] = "--debug";
capa["optional"]["debug"]["type"] = "debug"; capa["optional"]["debug"]["type"] = "debug";
capa["optional"]["startpos"]["name"] = "Starting position in live buffer";
capa["optional"]["startpos"]["help"] = "For live, where in the buffer the stream starts playback by default. 0 = beginning, 1000 = end";
capa["optional"]["startpos"]["option"] = "--startPos";
capa["optional"]["startpos"]["short"] = "P";
capa["optional"]["startpos"]["default"] = (long long)500;
capa["optional"]["startpos"]["type"] = "uint";
} }
Output::Output(Socket::Connection & conn) : myConn(conn) { Output::Output(Socket::Connection & conn) : myConn(conn) {

14
src/output/output_hds.cpp
View file

@ -57,19 +57,6 @@ namespace Mist {
int j = 0; int j = 0;
if (myMeta.tracks[tid].fragments.size()){ if (myMeta.tracks[tid].fragments.size()){
std::deque<DTSC::Fragment>::iterator fragIt = myMeta.tracks[tid].fragments.begin(); std::deque<DTSC::Fragment>::iterator fragIt = myMeta.tracks[tid].fragments.begin();
/*LTS-START*/
if (myMeta.live){
unsigned int skip = (( myMeta.tracks[tid].fragments.size()-1) * config->getInteger("startpos")) / 1000u;
for (unsigned int z = 0; z < skip; ++z){
++fragIt;
++j;
}
if (skip && fragIt == myMeta.tracks[tid].fragments.end()){
--fragIt;
--j;
}
}
/*LTS-END*/
unsigned int firstTime = myMeta.tracks[tid].getKey(fragIt->getNumber()).getTime(); unsigned int firstTime = myMeta.tracks[tid].getKey(fragIt->getNumber()).getTime();
while (fragIt != myMeta.tracks[tid].fragments.end()){ while (fragIt != myMeta.tracks[tid].fragments.end()){
if (myMeta.vod || fragIt->getDuration() > 0){ if (myMeta.vod || fragIt->getDuration() > 0){
@ -174,7 +161,6 @@ namespace Mist {
capa["methods"][0u]["type"] = "flash/11"; capa["methods"][0u]["type"] = "flash/11";
capa["methods"][0u]["priority"] = 6ll; capa["methods"][0u]["priority"] = 6ll;
capa["methods"][0u]["player_url"] = "/flashplayer.swf"; capa["methods"][0u]["player_url"] = "/flashplayer.swf";
cfg->getOption("startpos", true)[0u] = 0ll;
} }
void OutHDS::sendNext(){ void OutHDS::sendNext(){

5
src/output/output_hls.cpp
View file

@ -156,11 +156,6 @@ namespace Mist {
//only print the last segment when VoD //only print the last segment when VoD
lines.pop_back(); lines.pop_back();
/*LTS-START*/ /*LTS-START*/
unsigned int skip = (( myMeta.tracks[tid].fragments.size()-1) * config->getInteger("startpos")) / 1000u;
while (skippedLines < skip && lines.size() > 4){
lines.pop_front();
skippedLines++;
}
if (config->getInteger("listlimit")) { if (config->getInteger("listlimit")) {
unsigned long listlimit = config->getInteger("listlimit"); unsigned long listlimit = config->getInteger("listlimit");
while (lines.size() > listlimit) { while (lines.size() > listlimit) {