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

Forward skipping reduced to prevent jitter

Browse source
This commit is contained in:
Thulinma 2017-05-15 10:27:17 +02:00
parent 3cba6f011f
commit 60d647be8e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_progressive_mp4.cpp
View file

@ -863,11 +863,11 @@ namespace Mist {
//if header needed //if header needed
if (!partListLength || partListSent >= partListLength) { if (!partListLength || partListSent >= partListLength) {
DTSC::Track & mainTrk = myMeta.tracks[vidTrack]; DTSC::Track & mainTrk = myMeta.tracks[vidTrack];
// The extra 600ms here is for the metadata sync delay. // The extra 2000ms here is for the metadata sync delay.
// It can be removed once we get rid of that. // It can be removed once we get rid of that.
// (sync delay = ~1s, minimum lookAhead is 420ms -> ~600ms extra needed) // (sync delay = ~1s, minimum lookAhead is 420ms -> ~600ms extra needed, we use 2000ms to be safe)
if (myMeta.sourceURI.find("http://") == std::string::npos || myMeta.sourceURI.find(".m3u") == std::string::npos){ if (myMeta.sourceURI.find("http://") == std::string::npos || myMeta.sourceURI.find(".m3u") == std::string::npos){
if (fragSeqNum > 10 && thisPacket.getTime() + needsLookAhead + 600 < mainTrk.keys.rbegin()->getTime() && mainTrk.lastms - mainTrk.keys.rbegin()->getTime() > needsLookAhead){ if (fragSeqNum > 10 && thisPacket.getTime() + needsLookAhead + 2000 < mainTrk.keys.rbegin()->getTime() && mainTrk.lastms - mainTrk.keys.rbegin()->getTime() > needsLookAhead){
INFO_MSG("Skipping forward %llums (%llu ms LA)", mainTrk.keys.rbegin()->getTime() - thisPacket.getTime(), needsLookAhead); INFO_MSG("Skipping forward %llums (%llu ms LA)", mainTrk.keys.rbegin()->getTime() - thisPacket.getTime(), needsLookAhead);
seek(mainTrk.keys.rbegin()->getTime()); seek(mainTrk.keys.rbegin()->getTime());
return; return;

4
src/output/output_rtsp.cpp
View file

@ -96,9 +96,9 @@ namespace Mist {
lastTimeSync = timestamp; lastTimeSync = timestamp;
updateMeta(); updateMeta();
DTSC::Track & mainTrk = myMeta.tracks[getMainSelectedTrack()]; DTSC::Track & mainTrk = myMeta.tracks[getMainSelectedTrack()];
// The extra 1000ms here is for the metadata sync delay. // The extra 2000ms here is for the metadata sync delay.
// It can be removed once we get rid of that. // It can be removed once we get rid of that.
if (timestamp + 1000 + needsLookAhead < mainTrk.keys.rbegin()->getTime() && mainTrk.lastms - mainTrk.keys.rbegin()->getTime() > needsLookAhead){ if (timestamp + 2000 + needsLookAhead < mainTrk.keys.rbegin()->getTime() && mainTrk.lastms - mainTrk.keys.rbegin()->getTime() > needsLookAhead){
INFO_MSG("Skipping forward %llums (%llu ms LA)", mainTrk.keys.rbegin()->getTime() - thisPacket.getTime(), needsLookAhead); INFO_MSG("Skipping forward %llums (%llu ms LA)", mainTrk.keys.rbegin()->getTime() - thisPacket.getTime(), needsLookAhead);
seek(mainTrk.keys.rbegin()->getTime()); seek(mainTrk.keys.rbegin()->getTime());
return; return;