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

Extra sanity checks in MistOut* processes.

Browse source
This commit is contained in:
Thulinma 2014-08-05 16:04:34 +02:00
parent e2eee229df
commit 0d4adb98cb
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/output/output.cpp
View file

@ -304,15 +304,17 @@ namespace Mist {
//try to fill as many codecs simultaneously as possible //try to fill as many codecs simultaneously as possible
if (capa["codecs"][bestSoFar].size() > 0){ if (capa["codecs"][bestSoFar].size() > 0){
for (JSON::ArrIter itb = capa["codecs"][bestSoFar].ArrBegin(); itb != capa["codecs"][bestSoFar].ArrEnd(); itb++){ for (JSON::ArrIter itb = capa["codecs"][bestSoFar].ArrBegin(); itb != capa["codecs"][bestSoFar].ArrEnd(); itb++){
if ((*itb).size() > 0){ if ((*itb).size() && myMeta.tracks.size()){
bool found = false; bool found = false;
for (JSON::ArrIter itc = (*itb).ArrBegin(); itc != (*itb).ArrEnd() && !found; itc++){ for (JSON::ArrIter itc = (*itb).ArrBegin(); itc != (*itb).ArrEnd() && !found; itc++){
if (selectedTracks.size()){
for (std::set<long unsigned int>::iterator itd = selectedTracks.begin(); itd != selectedTracks.end(); itd++){ for (std::set<long unsigned int>::iterator itd = selectedTracks.begin(); itd != selectedTracks.end(); itd++){
if (myMeta.tracks[*itd].codec == (*itc).asStringRef()){ if (myMeta.tracks[*itd].codec == (*itc).asStringRef()){
found = true; found = true;
break; break;
} }
} }
}
if (!found){ if (!found){
for (std::map<int,DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){ for (std::map<int,DTSC::Track>::iterator trit = myMeta.tracks.begin(); trit != myMeta.tracks.end(); trit++){
if (trit->second.codec == (*itc).asStringRef()){ if (trit->second.codec == (*itc).asStringRef()){
@ -327,17 +329,19 @@ namespace Mist {
} }
} }
#if DEBUG >= DLVL_MEDIUM if (Util::Config::printDebugLevel >= DLVL_MEDIUM){
//print the selected tracks //print the selected tracks
std::stringstream selected; std::stringstream selected;
if (selectedTracks.size()){
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (it != selectedTracks.begin()){ if (it != selectedTracks.begin()){
selected << ", "; selected << ", ";
} }
selected << (*it); selected << (*it);
} }
DEBUG_MSG(DLVL_MEDIUM, "Selected tracks: %s", selected.str().c_str()); }
#endif DEBUG_MSG(DLVL_MEDIUM, "Selected tracks: %s (%lu)", selected.str().c_str(), selectedTracks.size());
}
sought = false; sought = false;
} }