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

Simplified RTSP start/end time logic

Browse source
This commit is contained in:
Thulinma 2016-11-15 11:58:42 +01:00
parent 84e23f5e5d
commit 7228f059e8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_rtsp.cpp
View file

@ -195,8 +195,6 @@ namespace Mist {
} }
if (HTTP_R.method == "DESCRIBE"){ if (HTTP_R.method == "DESCRIBE"){
initialize(); initialize();
uint64_t firstms = startTime();
uint64_t lastms = endTime();
selectedTracks.clear(); selectedTracks.clear();
std::stringstream transportString; std::stringstream transportString;
transportString << "v=0\r\n" transportString << "v=0\r\n"
@ -210,9 +208,9 @@ namespace Mist {
"a=type:broadcast\r\n" "a=type:broadcast\r\n"
"a=control:*\r\n"; "a=control:*\r\n";
if (myMeta.live){ if (myMeta.live){
transportString << "a=range:npt=" << ((double)firstms) / 1000.0 << "-\r\n"; transportString << "a=range:npt=" << ((double)startTime()) / 1000.0 << "-\r\n";
}else{ }else{
transportString << "a=range:npt=" << ((double)firstms) / 1000.0 << "-" << ((double)lastms) / 1000.0 << "\r\n"; transportString << "a=range:npt=" << ((double)startTime()) / 1000.0 << "-" << ((double)endTime()) / 1000.0 << "\r\n";
} }
for (std::map<unsigned int, DTSC::Track>::iterator objIt = myMeta.tracks.begin(); objIt != myMeta.tracks.end(); ++objIt) { for (std::map<unsigned int, DTSC::Track>::iterator objIt = myMeta.tracks.begin(); objIt != myMeta.tracks.end(); ++objIt) {