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

Added writable identifier, to uniquely define a track when writing it to a file or socket.

Browse source
This commit is contained in:
Erik Zandvliet 2014-01-07 11:57:13 +01:00
parent e94565a270
commit 1477939924
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/dtsc.h
View file

@ -152,6 +152,7 @@ namespace DTSC {
int getSendLen(); int getSendLen();
void send(Socket::Connection & conn); void send(Socket::Connection & conn);
std::string getIdentifier(); std::string getIdentifier();
std::string getWritableIdentifier();
JSON::Value toJSON(); JSON::Value toJSON();
long long unsigned int fragLen; long long unsigned int fragLen;
Fragment* fragments; Fragment* fragments;

22
lib/dtscmeta.cpp
View file

@ -354,6 +354,12 @@ namespace DTSC {
return result.str(); return result.str();
} }
std::string readOnlyTrack::getWritableIdentifier(){
std::stringstream result;
result << getIdentifier() << "_" << trackID;
return result.str( );
}
void Track::reset(){ void Track::reset(){
fragments.clear(); fragments.clear();
parts.clear(); parts.clear();
@ -469,7 +475,7 @@ namespace DTSC {
} }
int readOnlyTrack::getSendLen(){ int readOnlyTrack::getSendLen(){
int result = 146 + init.size() + codec.size() + type.size() + getIdentifier().size(); int result = 146 + init.size() + codec.size() + type.size() + getWritableIdentifier().size();
result += fragLen * 11; result += fragLen * 11;
result += keyLen * 16; result += keyLen * 16;
result += partLen * 9; result += partLen * 9;
@ -487,7 +493,7 @@ namespace DTSC {
} }
int Track::getSendLen(){ int Track::getSendLen(){
int result = 146 + init.size() + codec.size() + type.size() + getIdentifier().size(); int result = 146 + init.size() + codec.size() + type.size() + getWritableIdentifier().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;
@ -505,8 +511,8 @@ namespace DTSC {
} }
void readOnlyTrack::send(Socket::Connection & conn){ void readOnlyTrack::send(Socket::Connection & conn){
conn.SendNow(convertShort(getIdentifier().size()), 2); conn.SendNow(convertShort(getWritableIdentifier().size()), 2);
conn.SendNow(getIdentifier()); conn.SendNow(getWritableIdentifier());
conn.SendNow("\340", 1);//Begin track object conn.SendNow("\340", 1);//Begin track object
conn.SendNow("\000\011fragments\002", 12); conn.SendNow("\000\011fragments\002", 12);
conn.SendNow(convertInt(fragLen*11), 4); conn.SendNow(convertInt(fragLen*11), 4);
@ -565,8 +571,8 @@ namespace DTSC {
} }
void Track::send(Socket::Connection & conn){ void Track::send(Socket::Connection & conn){
conn.SendNow(convertShort(getIdentifier().size()), 2); conn.SendNow(convertShort(getWritableIdentifier().size()), 2);
conn.SendNow(getIdentifier()); conn.SendNow(getWritableIdentifier());
conn.SendNow("\340", 1);//Begin track object conn.SendNow("\340", 1);//Begin track object
conn.SendNow("\000\011fragments\002", 12); conn.SendNow("\000\011fragments\002", 12);
conn.SendNow(convertInt(fragments.size()*11), 4); conn.SendNow(convertInt(fragments.size()*11), 4);
@ -782,7 +788,7 @@ namespace DTSC {
JSON::Value Meta::toJSON(){ JSON::Value Meta::toJSON(){
JSON::Value result; JSON::Value result;
for (std::map<int,Track>::iterator it = tracks.begin(); it != tracks.end(); it++){ for (std::map<int,Track>::iterator it = tracks.begin(); it != tracks.end(); it++){
result["tracks"][it->second.getIdentifier()] = it->second.toJSON(); result["tracks"][it->second.getWritableIdentifier()] = it->second.toJSON();
} }
if (vod){ if (vod){
result["vod"] = 1ll; result["vod"] = 1ll;
@ -803,7 +809,7 @@ namespace DTSC {
JSON::Value readOnlyMeta::toJSON(){ JSON::Value readOnlyMeta::toJSON(){
JSON::Value result; JSON::Value result;
for (std::map<int,readOnlyTrack>::iterator it = tracks.begin(); it != tracks.end(); it++){ for (std::map<int,readOnlyTrack>::iterator it = tracks.begin(); it != tracks.end(); it++){
result["tracks"][it->second.getIdentifier()] = it->second.toJSON(); result["tracks"][it->second.getWritableIdentifier()] = it->second.toJSON();
} }
if (vod){ if (vod){
result["vod"] = 1ll; result["vod"] = 1ll;