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

Added ID and comment header support for theora and vorbis

Browse source
This commit is contained in:
Erik Zandvliet 2013-11-28 11:08:46 +01:00
parent 8f8b3694b0
commit 35ee722f81
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/dtsc.h
View file

@ -178,6 +178,9 @@ namespace DTSC {
int width; int width;
int height; int height;
int fpks; int fpks;
//vorbis and theora only
std::string idHeader;
std::string commentHeader;
}; };
class Track : public readOnlyTrack { class Track : public readOnlyTrack {

42
lib/dtscmeta.cpp
View file

@ -166,6 +166,10 @@ namespace DTSC {
height = trackRef["height"].asInt(); height = trackRef["height"].asInt();
fpks = trackRef["fpks"].asInt(); fpks = trackRef["fpks"].asInt();
} }
if (codec == "vorbis" || codec == "theora"){
idHeader = trackRef["idheader"].asString();
commentHeader = trackRef["commentheader"].asString();
}
} }
Track::Track(){} Track::Track(){}
@ -186,6 +190,8 @@ namespace DTSC {
width = rhs.width; width = rhs.width;
height = rhs.height; height = rhs.height;
fpks = rhs.fpks; fpks = rhs.fpks;
idHeader = rhs.idHeader;
commentHeader = rhs.commentHeader;
if (rhs.fragments && rhs.fragLen){ if (rhs.fragments && rhs.fragLen){
fragments = std::deque<Fragment>(rhs.fragments, rhs.fragments + rhs.fragLen); fragments = std::deque<Fragment>(rhs.fragments, rhs.fragments + rhs.fragLen);
} }
@ -229,6 +235,10 @@ namespace DTSC {
height = trackRef["height"].asInt(); height = trackRef["height"].asInt();
fpks = trackRef["fpks"].asInt(); fpks = trackRef["fpks"].asInt();
} }
if (codec == "vorbis" || codec == "theora"){
idHeader = trackRef["idheader"].asString();
commentHeader = trackRef["commentheader"].asString();
}
} }
void Track::update(JSON::Value & pack){ void Track::update(JSON::Value & pack){
@ -459,6 +469,10 @@ namespace DTSC {
}else if (type == "video"){ }else if (type == "video"){
result += 48; result += 48;
} }
if (codec == "vorbis" || codec == "theora"){
result += 15 + idHeader.size();//idheader
result += 20 + commentHeader.size();//commentheader
}
return result; return result;
} }
@ -472,6 +486,10 @@ namespace DTSC {
}else if (type == "video"){ }else if (type == "video"){
result += 48; result += 48;
} }
if (codec == "vorbis" || codec == "theora"){
result += 15 + idHeader.size();//idheader
result += 20 + commentHeader.size();//commentheader
}
return result; return result;
} }
@ -522,6 +540,14 @@ namespace DTSC {
conn.SendNow("\000\004fpks\001", 7); conn.SendNow("\000\004fpks\001", 7);
conn.SendNow(convertLongLong(fpks), 8); conn.SendNow(convertLongLong(fpks), 8);
} }
if (codec == "vorbis" || codec == "theora"){
conn.SendNow("\000\010idheader\002", 11);
conn.SendNow(convertInt(idHeader.size()), 4);
conn.SendNow(idHeader);
conn.SendNow("\000\015commentheader\002", 16);
conn.SendNow(convertInt(commentHeader.size()), 4);
conn.SendNow(commentHeader);
}
conn.SendNow("\000\000\356", 3);//End this track Object conn.SendNow("\000\000\356", 3);//End this track Object
} }
@ -578,6 +604,14 @@ namespace DTSC {
conn.SendNow("\000\004fpks\001", 7); conn.SendNow("\000\004fpks\001", 7);
conn.SendNow(convertLongLong(fpks), 8); conn.SendNow(convertLongLong(fpks), 8);
} }
if (codec == "vorbis" || codec == "theora"){
conn.SendNow("\000\010idheader\002", 11);
conn.SendNow(convertInt(idHeader.size()), 4);
conn.SendNow(idHeader);
conn.SendNow("\000\015commentheader\002", 16);
conn.SendNow(convertInt(commentHeader.size()), 4);
conn.SendNow(commentHeader);
}
conn.SendNow("\000\000\356", 3);//End this track Object conn.SendNow("\000\000\356", 3);//End this track Object
} }
@ -670,6 +704,10 @@ namespace DTSC {
result["height"] = height; result["height"] = height;
result["fpks"] = fpks; result["fpks"] = fpks;
} }
if (codec == "vorbis" || codec == "theora"){
result["idheader"] = idHeader;
result["commentheader"] = commentHeader;
}
return result; return result;
} }
@ -713,6 +751,10 @@ namespace DTSC {
result["height"] = height; result["height"] = height;
result["fpks"] = fpks; result["fpks"] = fpks;
} }
if (codec == "vorbis" || codec == "theora"){
result["idheader"] = idHeader;
result["commentheader"] = commentHeader;
}
return result; return result;
} }