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

Updated to make use of new waitForMeta library call.

Browse source
This commit is contained in:
Thulinma 2013-08-23 10:39:33 +02:00
parent 2bc9858b66
commit 75d6c7d474
8 changed files with 9 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/connectors/conn_http_dynamic.cpp
View file

@ -178,14 +178,7 @@ namespace Connector_HTTP {
continue;
}
ss.setBlocking(false);
//make sure metadata is received
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
while (Strm.parsePacket(ss.Received())){
//do nothing
}
}
}
Strm.waitForMeta(ss);
}
if (HTTP_R.url.find(".abst") != std::string::npos){
std::string streamID = HTTP_R.url.substr(HTTP_R.url.find(streamname) + streamname.size() + 1);

9
src/connectors/conn_http_live.cpp
View file

@ -149,14 +149,7 @@ namespace Connector_HTTP {
continue;
}
ss.setBlocking(false);
//make sure metadata is received
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
while (Strm.parsePacket(ss.Received())){
//do nothing
}
}
}
Strm.waitForMeta(ss);
}
if (HTTP_R.url.find(".m3u") == std::string::npos){
temp = HTTP_R.url.find("/", 5) + 1;

9
src/connectors/conn_http_progressive_flv.cpp
View file

@ -97,14 +97,7 @@ namespace Connector_HTTP {
ready4data = false;
continue;
}
//wait until we have a header
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
Strm.parsePacket(ss.Received()); //read the metadata
}else{
Util::sleep(5);
}
}
Strm.waitForMeta(ss);
int byterate = 0;
for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){
if (videoID == -1 && objIt->second["type"].asString() == "video"){

9
src/connectors/conn_http_progressive_mp3.cpp
View file

@ -95,14 +95,7 @@ namespace Connector_HTTP {
ready4data = false;
continue;
}
//wait until we have a header
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
Strm.parsePacket(ss.Received()); //read the metadata
}else{
Util::sleep(5);
}
}
Strm.waitForMeta(ss);
int byterate = 0;
for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){
if (videoID == -1 && objIt->second["type"].asString() == "video"){

9
src/connectors/conn_http_progressive_ogg.cpp
View file

@ -103,14 +103,7 @@ namespace Connector_HTTP {
ready4data = false;
continue;
}
//wait until we have a header
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
Strm.parsePacket(ss.Received()); //read the metadata
}else{
Util::sleep(5);
}
}
Strm.waitForMeta(ss);
int byterate = 0;
for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){
if (videoID == -1 && objIt->second["type"].asString() == "video"){

9
src/connectors/conn_http_smooth.cpp
View file

@ -202,14 +202,7 @@ namespace Connector_HTTP {
continue;
}
ss.setBlocking(false);
//Do nothing until metadata has been received.
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
while (Strm.parsePacket(ss.Received())){
//do nothing
}
}
}
Strm.waitForMeta(ss);
for (JSON::ObjIter oIt = Strm.metadata["tracks"].ObjBegin(); oIt != Strm.metadata["tracks"].ObjEnd(); oIt++){
if (oIt->second["type"].asString() == "audio"){
allAudio[oIt->first] = oIt->second;

10
src/connectors/conn_rtmp.cpp
View file

@ -549,15 +549,7 @@ namespace Connector_RTMP {
break;
}
ss.setBlocking(false);
//assure metadata is received
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
Strm.parsePacket(ss.Received()); //read the metadata
}else{
Util::sleep(5);
}
}
Strm.waitForMeta(ss);
//find first audio and video tracks
for (JSON::ObjIter objIt = Strm.metadata["tracks"].ObjBegin(); objIt != Strm.metadata["tracks"].ObjEnd(); objIt++){
if (videoID == -1 && objIt->second["type"].asStringRef() == "video"){

9
src/connectors/conn_ts.cpp
View file

@ -65,14 +65,7 @@ namespace Connector_TS {
int videoID = -1;
int audioID = -1;
//make sure metadata is received
while ( !Strm.metadata && ss.connected()){
if (ss.spool()){
while (Strm.parsePacket(ss.Received())){
//do nothing
}
}
}
Strm.waitForMeta(ss);
if (Strm.metadata.isMember("tracks")){