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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output.h
#	src/output/output_rtmp.cpp
This commit is contained in:
Thulinma 2017-02-28 14:07:18 +01:00
commit daa0833970
6 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/dtsc.h
View file

@ -365,6 +365,7 @@ namespace DTSC {
uint16_t version;
long long int moreheader;
long long int bufferWindow;
std::string sourceURI;
};
/// An iterator helper for easily iterating over the parts in a Fragment.

19
lib/dtscmeta.cpp
View file

@ -1365,6 +1365,7 @@ namespace DTSC {
merged = source.getFlag("merged");
bufferWindow = source.getInt("buffer_window");
moreheader = source.getInt("moreheader");
source.getString("source", sourceURI);
Scan tmpTracks = source.getScan().getMember("tracks");
unsigned int num = 0;
Scan tmpTrack;
@ -1384,6 +1385,7 @@ namespace DTSC {
Meta::Meta(JSON::Value & meta) {
vod = meta.isMember("vod") && meta["vod"];
live = meta.isMember("live") && meta["live"];
sourceURI = meta.isMember("source") ? meta["source"].asStringRef() : "";
version = meta.isMember("version") ? meta["version"].asInt() : 0;
merged = meta.isMember("merged") && meta["merged"];
bufferWindow = 0;
@ -1826,6 +1828,7 @@ namespace DTSC {
}
}
if (version){dataLen += 18;}
if (sourceURI.size()){dataLen += 13+sourceURI.size();}
return dataLen + 8; //add 8 bytes header
}
@ -1855,6 +1858,11 @@ namespace DTSC {
writePointer(p, "\000\007version\001", 10);
writePointer(p, convertLongLong(version), 8);
}
if (sourceURI.size()) {
writePointer(p, "\000\006source\002", 9);
writePointer(p, convertInt(sourceURI.size()), 4);
writePointer(p, sourceURI);
}
if (bufferWindow) {
writePointer(p, "\000\015buffer_window\001", 16);
writePointer(p, convertLongLong(bufferWindow), 8);
@ -1892,6 +1900,11 @@ namespace DTSC {
conn.SendNow("\000\007version\001", 10);
conn.SendNow(convertLongLong(version), 8);
}
if (sourceURI.size()) {
conn.SendNow("\000\006source\002", 9);
conn.SendNow(convertInt(sourceURI.size()), 4);
conn.SendNow(sourceURI);
}
if (bufferWindow) {
conn.SendNow("\000\015buffer_window\001", 16);
conn.SendNow(convertLongLong(bufferWindow), 8);
@ -1987,6 +2000,9 @@ namespace DTSC {
if (version) {
result["version"] = (long long)version;
}
if (sourceURI.size()){
result["source"] = sourceURI;
}
result["moreheader"] = moreheader;
return result;
}
@ -2018,6 +2034,9 @@ namespace DTSC {
if (bufferWindow) {
str << std::string(indent, ' ') << "Buffer Window: " << bufferWindow << std::endl;
}
if (sourceURI.size()){
str << std::string(indent, ' ') << "Source: " << sourceURI << std::endl;
}
str << std::string(indent, ' ') << "More Header: " << moreheader << std::endl;
}