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

Initial progressive DTSC2 support.

Browse source
This commit is contained in:
Thulinma 2013-06-06 14:25:20 +02:00
parent 7e3c97355f
commit 849bc24557
1 changed files with 29 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/connectors/conn_http_progressive.cpp
View file

@ -43,9 +43,7 @@ namespace Connector_HTTP {
bool isMP3 = false;//Indicates whether the request is audio-only mp3. bool isMP3 = false;//Indicates whether the request is audio-only mp3.
std::string videoName;
int videoID = -1; int videoID = -1;
std::string audioName;
int audioID = -1; int audioID = -1;
while (conn.connected()){ while (conn.connected()){
@ -118,7 +116,6 @@ namespace Connector_HTTP {
ready4data = false; ready4data = false;
continue; continue;
} }
if (seek_byte){
//wait until we have a header //wait until we have a header
while ( !Strm.metadata){ while ( !Strm.metadata){
if (ss.spool()){ if (ss.spool()){
@ -129,23 +126,21 @@ namespace Connector_HTTP {
} }
int byterate = 0; int byterate = 0;
for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){ for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){
std::cerr << objIt->second["type"].asString() << " => " << objIt->second["trackid"].asInt() << std::endl;
if (videoID == -1 && objIt->second["type"].asString() == "video"){ if (videoID == -1 && objIt->second["type"].asString() == "video"){
videoID = objIt->second["trackid"].asInt(); videoID = objIt->second["trackid"].asInt();
videoName = objIt->first;
} }
if (audioID == -1 && objIt->second["type"].asString() == "audio"){ if (audioID == -1 && objIt->second["type"].asString() == "audio"){
audioID = objIt->second["trackid"].asInt(); audioID = objIt->second["trackid"].asInt();
audioName = objIt->first;
} }
} }
if (videoID != -1 && !isMP3){ if (videoID != -1 && !isMP3){
byterate += Strm.metadata["tracks"][videoName]["bps"].asInt(); byterate += Strm.getTrackById(videoID)["bps"].asInt();
} }
if (audioID != -1){ if (audioID != -1){
byterate += Strm.metadata["tracks"][audioName]["bps"].asInt(); byterate += Strm.getTrackById(audioID)["bps"].asInt();
} }
seek_sec = (seek_byte / byterate) * 1000; seek_sec = (seek_byte / byterate) * 1000;
}
std::stringstream cmd; std::stringstream cmd;
cmd << "t"; cmd << "t";
if (videoID != -1){ if (videoID != -1){
@ -154,11 +149,8 @@ namespace Connector_HTTP {
if (audioID != -1){ if (audioID != -1){
cmd << " " << audioID; cmd << " " << audioID;
} }
cmd << "\ns " << seek_sec << "\np\n";
ss.SendNow(cmd.str().c_str()); ss.SendNow(cmd.str().c_str());
cmd.str() = "";
cmd << "s " << seek_sec << "\n";
ss.SendNow(cmd.str().c_str());
ss.SendNow("p\n");
inited = true; inited = true;
} }
unsigned int now = Util::epoch(); unsigned int now = Util::epoch();
@ -182,16 +174,16 @@ namespace Connector_HTTP {
if ( !isMP3){ if ( !isMP3){
conn.SendNow(FLV::Header, 13); //write FLV header conn.SendNow(FLV::Header, 13); //write FLV header
//write metadata //write metadata
tag.DTSCMetaInit(Strm,videoName, audioName); tag.DTSCMetaInit(Strm, Strm.getTrackById(videoID), Strm.getTrackById(audioID));
conn.SendNow(tag.data, tag.len); conn.SendNow(tag.data, tag.len);
//write video init data, if needed //write video init data, if needed
if (videoID != -1 && Strm.metadata["video"].isMember("init")){ if (videoID != -1 && Strm.getTrackById(videoID).isMember("init")){
tag.DTSCVideoInit(Strm.metadata["tracks"][videoName]); tag.DTSCVideoInit(Strm.getTrackById(videoID));
conn.SendNow(tag.data, tag.len); conn.SendNow(tag.data, tag.len);
} }
//write audio init data, if needed //write audio init data, if needed
if (audioID != -1 && Strm.metadata["audio"].isMember("init")){ if (audioID != -1 && Strm.getTrackById(audioID).isMember("init")){
tag.DTSCAudioInit(Strm.metadata["tracks"][audioName]); tag.DTSCAudioInit(Strm.getTrackById(audioID));
conn.SendNow(tag.data, tag.len); conn.SendNow(tag.data, tag.len);
} }
} }