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

More fixes to metadata.

Browse source
This commit is contained in:
Thulinma 2013-12-03 16:25:10 +01:00
parent d52e05fbd2
commit 6adca64680
3 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/dtsc.h
View file

@ -162,7 +162,6 @@ namespace DTSC {
long long unsigned int partLen; long long unsigned int partLen;
Part* parts; Part* parts;
int trackID; int trackID;
int length;
int firstms; int firstms;
int lastms; int lastms;
int bps; int bps;
@ -209,7 +208,6 @@ namespace DTSC {
bool live; bool live;
bool merged; bool merged;
long long int moreheader; long long int moreheader;
long long int length;
long long int bufferWindow; long long int bufferWindow;
void send(Socket::Connection & conn); void send(Socket::Connection & conn);
JSON::Value toJSON(); JSON::Value toJSON();

21
lib/dtscmeta.cpp
View file

@ -152,7 +152,6 @@ namespace DTSC {
partLen = 0; partLen = 0;
} }
trackID = trackRef["trackid"].asInt(); trackID = trackRef["trackid"].asInt();
length = trackRef["length"].asInt();
firstms = trackRef["firstms"].asInt(); firstms = trackRef["firstms"].asInt();
lastms = trackRef["lastms"].asInt(); lastms = trackRef["lastms"].asInt();
bps = trackRef["bps"].asInt(); bps = trackRef["bps"].asInt();
@ -180,7 +179,6 @@ namespace DTSC {
Track::Track(const readOnlyTrack & rhs){ Track::Track(const readOnlyTrack & rhs){
trackID = rhs.trackID; trackID = rhs.trackID;
length = rhs.length;
firstms = rhs.firstms; firstms = rhs.firstms;
lastms = rhs.lastms; lastms = rhs.lastms;
bps = rhs.bps; bps = rhs.bps;
@ -221,7 +219,6 @@ namespace DTSC {
parts = std::deque<Part>(tmp,tmp + (trackRef["parts"].asString().size() / 9)); parts = std::deque<Part>(tmp,tmp + (trackRef["parts"].asString().size() / 9));
} }
trackID = trackRef["trackid"].asInt(); trackID = trackRef["trackid"].asInt();
length = trackRef["length"].asInt();
firstms = trackRef["firstms"].asInt(); firstms = trackRef["firstms"].asInt();
lastms = trackRef["lastms"].asInt(); lastms = trackRef["lastms"].asInt();
bps = trackRef["bps"].asInt(); bps = trackRef["bps"].asInt();
@ -339,7 +336,6 @@ namespace DTSC {
vod = false; vod = false;
live = false; live = false;
moreheader = 0; moreheader = 0;
length = 0;
merged = false; merged = false;
bufferWindow = 0; bufferWindow = 0;
} }
@ -347,7 +343,6 @@ namespace DTSC {
readOnlyMeta::readOnlyMeta(JSON::Value & meta){ readOnlyMeta::readOnlyMeta(JSON::Value & meta){
vod = meta.isMember("vod") && meta["vod"]; vod = meta.isMember("vod") && meta["vod"];
live = meta.isMember("live") && meta["live"]; live = meta.isMember("live") && meta["live"];
length = 0;
merged = meta.isMember("merged") && meta["merged"]; merged = meta.isMember("merged") && meta["merged"];
bufferWindow = 0; bufferWindow = 0;
if (meta.isMember("buffer_window")){ if (meta.isMember("buffer_window")){
@ -356,9 +351,6 @@ namespace DTSC {
for (JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it++){ for (JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it++){
if (it->second.isMember("trackid") && it->second["trackid"]){ if (it->second.isMember("trackid") && it->second["trackid"]){
tracks[it->second["trackid"].asInt()] = readOnlyTrack(it->second); tracks[it->second["trackid"].asInt()] = readOnlyTrack(it->second);
if (length < (it->second["lastms"].asInt() - it->second["firstms"].asInt())){
length = (it->second["lastms"].asInt() - it->second["firstms"].asInt());
}
} }
} }
moreheader = meta["moreheader"].asInt(); moreheader = meta["moreheader"].asInt();
@ -368,7 +360,6 @@ namespace DTSC {
vod = false; vod = false;
live = false; live = false;
moreheader = 0; moreheader = 0;
length = 0;
merged = false; merged = false;
bufferWindow = 0; bufferWindow = 0;
} }
@ -377,7 +368,6 @@ namespace DTSC {
vod = rhs.vod; vod = rhs.vod;
live = rhs.live; live = rhs.live;
merged = rhs.merged; merged = rhs.merged;
length = rhs.length;
bufferWindow = rhs.bufferWindow; bufferWindow = rhs.bufferWindow;
for (std::map<int,readOnlyTrack>::const_iterator it = rhs.tracks.begin(); it != rhs.tracks.end(); it++){ for (std::map<int,readOnlyTrack>::const_iterator it = rhs.tracks.begin(); it != rhs.tracks.end(); it++){
tracks[it->first] = it->second; tracks[it->first] = it->second;
@ -396,9 +386,6 @@ namespace DTSC {
for (JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it++){ for (JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it++){
if(it->second["trackid"].asInt()){ if(it->second["trackid"].asInt()){
tracks[it->second["trackid"].asInt()] = Track(it->second); tracks[it->second["trackid"].asInt()] = Track(it->second);
if (length < (it->second["lastms"].asInt() - it->second["firstms"].asInt())){
length = (it->second["lastms"].asInt() - it->second["firstms"].asInt());
}
} }
} }
moreheader = meta["moreheader"].asInt(); moreheader = meta["moreheader"].asInt();
@ -459,7 +446,7 @@ namespace DTSC {
} }
int Track::getSendLen(){ int Track::getSendLen(){
int result = 163 + init.size() + codec.size() + type.size() + getIdentifier().size(); int result = 146 + init.size() + codec.size() + type.size() + getIdentifier().size();
result += fragments.size() * 11; result += fragments.size() * 11;
result += keys.size() * 16; result += keys.size() * 16;
result += parts.size() * 9; result += parts.size() * 9;
@ -490,8 +477,6 @@ namespace DTSC {
conn.SendNow((char*)parts, partLen*9); conn.SendNow((char*)parts, partLen*9);
conn.SendNow("\000\007trackid\001", 10); conn.SendNow("\000\007trackid\001", 10);
conn.SendNow(convertLongLong(trackID), 8); conn.SendNow(convertLongLong(trackID), 8);
conn.SendNow("\000\006length\001", 9);
conn.SendNow(convertLongLong(length), 8);
conn.SendNow("\000\007firstms\001", 10); conn.SendNow("\000\007firstms\001", 10);
conn.SendNow(convertLongLong(firstms), 8); conn.SendNow(convertLongLong(firstms), 8);
conn.SendNow("\000\006lastms\001", 9); conn.SendNow("\000\006lastms\001", 9);
@ -554,8 +539,6 @@ namespace DTSC {
} }
conn.SendNow("\000\007trackid\001", 10); conn.SendNow("\000\007trackid\001", 10);
conn.SendNow(convertLongLong(trackID), 8); conn.SendNow(convertLongLong(trackID), 8);
conn.SendNow("\000\006length\001", 9);
conn.SendNow(convertLongLong(length), 8);
conn.SendNow("\000\007firstms\001", 10); conn.SendNow("\000\007firstms\001", 10);
conn.SendNow(convertLongLong(firstms), 8); conn.SendNow(convertLongLong(firstms), 8);
conn.SendNow("\000\006lastms\001", 9); conn.SendNow("\000\006lastms\001", 9);
@ -675,7 +658,6 @@ namespace DTSC {
result["parts"] = std::string((char*)parts, partLen * 9); result["parts"] = std::string((char*)parts, partLen * 9);
} }
result["trackid"] = trackID; result["trackid"] = trackID;
result["length"] = length;
result["firstms"] = firstms; result["firstms"] = firstms;
result["lastms"] = lastms; result["lastms"] = lastms;
result["bps"] = bps; result["bps"] = bps;
@ -722,7 +704,6 @@ namespace DTSC {
} }
result["parts"] = tmp; result["parts"] = tmp;
result["trackid"] = trackID; result["trackid"] = trackID;
result["length"] = length;
result["firstms"] = firstms; result["firstms"] = firstms;
result["lastms"] = lastms; result["lastms"] = lastms;
result["bps"] = bps; result["bps"] = bps;

2
lib/flv_tag.cpp
View file

@ -658,7 +658,7 @@ bool FLV::Tag::DTSCMetaInit(DTSC::Stream & S, DTSC::Track & videoRef, DTSC::Trac
int i = 0; int i = 0;
if (audioRef){ if (audioRef){
trinfo.addContent(AMF::Object("", AMF::AMF0_OBJECT)); trinfo.addContent(AMF::Object("", AMF::AMF0_OBJECT));
trinfo.getContentP(i)->addContent(AMF::Object("length", ((double)S.metadata.length) * ((double)audioRef.rate), AMF::AMF0_NUMBER)); trinfo.getContentP(i)->addContent(AMF::Object("length", ((double)audioRef.lastms) * ((double)audioRef.rate), AMF::AMF0_NUMBER));
trinfo.getContentP(i)->addContent(AMF::Object("timescale", audioRef.rate, AMF::AMF0_NUMBER)); trinfo.getContentP(i)->addContent(AMF::Object("timescale", audioRef.rate, AMF::AMF0_NUMBER));
trinfo.getContentP(i)->addContent(AMF::Object("sampledescription", AMF::AMF0_STRICT_ARRAY)); trinfo.getContentP(i)->addContent(AMF::Object("sampledescription", AMF::AMF0_STRICT_ARRAY));
if (audioRef.codec == "AAC"){ if (audioRef.codec == "AAC"){