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

Fixed high debugging levels problems.

Browse source
This commit is contained in:
Thulinma 2014-01-31 14:31:56 +01:00
parent 32847f80f0
commit 57967696c2
4 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/connectors/conn_http_dynamic.cpp
View file

@ -199,7 +199,7 @@ namespace Connector_HTTP {
temp = HTTP_R.url.find("Frag") + 4;
ReqFragment = atoi(HTTP_R.url.substr(temp).c_str());
#if DEBUG >= 5
printf("Video track %d, segment %d, fragment %d\n", Quality, Segment, ReqFragment);
printf("Video track %d, fragment %d\n", Quality, ReqFragment);
#endif
if (!audioTrack){getTracks(Strm.metadata);}
DTSC::Track & vidTrack = Strm.metadata.tracks[Quality];

4
src/connectors/conn_http_live.cpp
View file

@ -57,7 +57,7 @@ namespace Connector_HTTP {
}
}
#if DEBUG >= 8
std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
std::cerr << "Sending this index:" << std::endl << result.str() << std::endl;
#endif
return result.str();
}
@ -85,7 +85,7 @@ namespace Connector_HTTP {
result << "#EXT-X-ENDLIST\r\n";
}
#if DEBUG >= 8
std::cerr << "Sending this index:" << std::endl << Result.str() << std::endl;
std::cerr << "Sending this index:" << std::endl << result.str() << std::endl;
#endif
return result.str();
} //liveIndex

2
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -476,7 +476,7 @@ namespace Connector_HTTP {
}else if(Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
#if DEBUG >= DLVL_HIGH
if (!sortSet.empty()){
if (sortSet.begin()->trackID != Strm.getPacket()["trackid"].asInt() || sortSet.begin()->time != Strm.getPacket()["time"].asInt()){
if ((long long)sortSet.begin()->trackID != Strm.getPacket()["trackid"].asInt() || (long long)sortSet.begin()->time != Strm.getPacket()["time"].asInt()){
DEBUG_MSG(DLVL_HIGH, "Set[%d, %d] => Real[%d, %d]", sortSet.begin()->trackID, sortSet.begin()->time, Strm.getPacket()["trackid"].asInt(), Strm.getPacket()["time"].asInt());
}
//add keyPart to sortSet

15
src/converters/dtsc2ogg.cpp
View file

@ -28,28 +28,13 @@ namespace Converters{
//create DTSC in OGG pages
DTSCFile.parseNext();
std::map< long long int, std::vector<JSON::Value> > DTSCBuffer;
long long int currID;
OGG::Page curOggPage;
while(DTSCFile.getJSON()){
//currID = DTSCFile.getJSON()["trackid"].asInt();
//if (!DTSCBuffer[currID].empty()){
std::string tmpString;
oggMeta.readDTSCVector(DTSCFile.getJSON(), tmpString);
std::cout << tmpString;
//DTSCBuffer[currID].clear();
//}
//DTSCBuffer[currID].push_back(DTSCFile.getJSON());
DTSCFile.parseNext();
}
//outputting end of stream pages
//for (std::map< long long int, std::vector<JSON::Value> >::iterator it = DTSCBuffer.begin(); it != DTSCBuffer.end(); it++){
//if (!DTSCBuffer[it->first].empty() && DTSCBuffer[it->first][0]["data"].asString() != ""){
//std::cout << oggMeta.readDTSCVector(DTSCBuffer[it->first]);
//}
//}
return 0;
}
}