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

Added bootMsOffset to DTSC::Meta, RTMP now syncs on it.

Browse source
This commit is contained in:
Thulinma 2018-06-25 14:23:01 +02:00
parent 5de902eee1
commit 2a028fa309
5 changed files with 51 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/output/output.cpp
View file

@ -1712,6 +1712,7 @@ namespace Mist{
return false;
}
}
initialize();
return true;
}
@ -1751,6 +1752,7 @@ namespace Mist{
DTSC::Meta reMeta;
reMeta.reinit(tmpMeta);
myMeta.sourceURI = reMeta.sourceURI;
myMeta.bootMsOffset = reMeta.bootMsOffset;
}
if (liveSem){
liveSem->post();
@ -1758,6 +1760,7 @@ namespace Mist{
liveSem = 0;
}
}
nProxy.metaPages.clear();
}
}
}

13
src/output/output_rtmp.cpp
View file

@ -13,6 +13,7 @@ namespace Mist{
OutRTMP::OutRTMP(Socket::Connection & conn) : Output(conn){
lastOutTime = 0;
rtmpOffset = 0;
bootMsOffset = 0;
maxbps = config->getInteger("maxkbps")*128;
if (config->getString("target").size() && config->getString("target").substr(0, 7) == "rtmp://"){
streamName = config->getString("streamname");
@ -1088,6 +1089,16 @@ namespace Mist{
F.toMeta(myMeta, *amf_storage, reTrack);
if (F.getDataLen() && !(F.needsInitData() && F.isInitData())){
uint64_t tagTime = next.timestamp;
if (!bootMsOffset){
if (myMeta.bootMsOffset){
bootMsOffset = myMeta.bootMsOffset;
rtmpOffset = (Util::bootMS() - tagTime) - bootMsOffset;
}else{
bootMsOffset = Util::bootMS() - tagTime;
rtmpOffset = 0;
}
}
tagTime += rtmpOffset;
uint64_t & ltt = lastTagTime[reTrack];
//Check for decreasing timestamps - this is a connection error.
//We allow wrapping around the 32 bits maximum value if the most significant 8 bits are set.
@ -1112,7 +1123,7 @@ namespace Mist{
ptr[i+1] = tmpchar;
}
}
thisPacket.genericFill(tagTime, F.offset(), reTrack, F.getData(), F.getDataLen(), 0, F.isKeyframe);
thisPacket.genericFill(tagTime, F.offset(), reTrack, F.getData(), F.getDataLen(), 0, F.isKeyframe, F.isKeyframe?bootMsOffset:0);
ltt = tagTime;
if (!nProxy.userClient.getData()){
char userPageName[NAME_BUFFER_SIZE];

1
src/output/output_rtmp.h
View file

@ -21,6 +21,7 @@ namespace Mist {
int64_t rtmpOffset;
uint64_t lastOutTime;
unsigned int maxbps;
int64_t bootMsOffset;
std::string app_name;
void parseChunk(Socket::Buffer & inputBuffer);
void parseAMFCommand(AMF::Object & amfData, int messageType, int streamId);