diff --git a/src/input/input.cpp b/src/input/input.cpp index 6f2cea97..2549bd43 100644 --- a/src/input/input.cpp +++ b/src/input/input.cpp @@ -297,7 +297,7 @@ namespace Mist { it->second.curOffset = 0; getNext(); //in case earlier seeking was inprecise, seek to the exact point - while (lastPack && lastPack.getTime() < myMeta.tracks[track].keys[pageNum-1].getTime()){ + while (lastPack && lastPack.getTime() < (unsigned long long)myMeta.tracks[track].keys[pageNum-1].getTime()){ getNext(); } while (lastPack && lastPack.getTime() < stopTime){ @@ -320,7 +320,7 @@ namespace Mist { } bool Input::atKeyFrame(){ - static std::map lastSeen; + static std::map lastSeen; //not in keyTimes? We're not at a keyframe. unsigned int c = keyTimes[lastPack.getTrackId()].count(lastPack.getTime()); if (!c){ diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp index 7408f58d..e6d91684 100644 --- a/src/input/input_buffer.cpp +++ b/src/input/input_buffer.cpp @@ -80,7 +80,7 @@ namespace Mist { if (myMeta.tracks[tid].keys[0].getNumber() >= (++(inputLoc[tid].begin()))->first){ //Find page in indexpage and null it for (int i = 0; i < 8192; i += 8){ - int thisKeyNum = ((((long long int *)(indexPages[tid].mapped + i))[0]) >> 32) & 0xFFFFFFFF; + unsigned int thisKeyNum = ((((long long int *)(indexPages[tid].mapped + i))[0]) >> 32) & 0xFFFFFFFF; if (thisKeyNum == htonl(pagesByTrack[tid].begin()->first) && ((((long long int *)(indexPages[tid].mapped + i))[0]) != 0)){ (((long long int *)(indexPages[tid].mapped + i))[0]) = 0; } @@ -249,7 +249,7 @@ namespace Mist { dataPages[value][nextPage].init(nextPageName, 20971520, true); bool createdNew = false; for (int i = 0; i < 8192; i += 8){ - int thisKeyNum = ((((long long int *)(indexPages[value].mapped + i))[0]) >> 32) & 0xFFFFFFFF; + unsigned int thisKeyNum = ((((long long int *)(indexPages[value].mapped + i))[0]) >> 32) & 0xFFFFFFFF; if (thisKeyNum == htonl(currentPage)){ if((ntohl((((long long int*)(indexPages[value].mapped + i))[0]) & 0xFFFFFFFF) == 1000)){ ((long long int *)(indexPages[value].mapped + i))[0] &= 0xFFFFFFFF00000000ull; diff --git a/src/input/input_flv.cpp b/src/input/input_flv.cpp index 25868bc6..4698574b 100644 --- a/src/input/input_flv.cpp +++ b/src/input/input_flv.cpp @@ -110,7 +110,7 @@ namespace Mist { //Flv files are never multi-track, so track 1 is video, track 2 is audio. int trackSeek = (selectedTracks.count(1) ? 1 : 2); size_t seekPos = myMeta.tracks[trackSeek].keys[0].getBpos(); - for (int i = 0; i < myMeta.tracks[trackSeek].keys.size(); i++){ + for (unsigned int i = 0; i < myMeta.tracks[trackSeek].keys.size(); i++){ if (myMeta.tracks[trackSeek].keys[i].getTime() > seekTime){ break; } @@ -121,7 +121,7 @@ namespace Mist { void inputFLV::trackSelect(std::string trackSpec) { selectedTracks.clear(); - long long int index; + size_t index; while (trackSpec != "") { index = trackSpec.find(' '); selectedTracks.insert(atoi(trackSpec.substr(0, index).c_str())); diff --git a/src/input/input_ogg.cpp b/src/input/input_ogg.cpp index 64acf36b..6d62eef9 100644 --- a/src/input/input_ogg.cpp +++ b/src/input/input_ogg.cpp @@ -265,11 +265,11 @@ namespace Mist { void inputOGG::trackSelect(std::string trackSpec) { selectedTracks.clear(); - long long int index; + size_t index; while (trackSpec != "") { index = trackSpec.find(' '); selectedTracks.insert(atoi(trackSpec.substr(0, index).c_str())); - DEBUG_MSG(DLVL_WARN, "Added track %d, index = %lld, (index == npos) = %d", atoi(trackSpec.substr(0, index).c_str()), index, index == std::string::npos); + DEBUG_MSG(DLVL_WARN, "Added track %d, index = %lu, (index == npos) = %d", atoi(trackSpec.substr(0, index).c_str()), index, index == std::string::npos); if (index != std::string::npos) { trackSpec.erase(0, index + 1); } else { diff --git a/src/output/output.cpp b/src/output/output.cpp index f7eecbbd..9b89f232 100644 --- a/src/output/output.cpp +++ b/src/output/output.cpp @@ -20,7 +20,7 @@ namespace Mist { return ntohl(((int*)(mapped + offset))[1]); } - long long int getDTSCTime(char * mapped, long long int offset){ + unsigned long long getDTSCTime(char * mapped, long long int offset){ char * timePoint = mapped + offset + 12; return ((long long int)timePoint[0] << 56) | ((long long int)timePoint[1] << 48) | ((long long int)timePoint[2] << 40) | ((long long int)timePoint[3] << 32) | ((long long int)timePoint[4] << 24) | ((long long int)timePoint[5] << 16) | ((long long int)timePoint[6] << 8) | timePoint[7]; } @@ -106,8 +106,8 @@ namespace Mist { tmp[6 * bufConnOffset + 4] = 0xFF; tmp[6 * bufConnOffset + 5] = 0xFF; playerConn.keepAlive(); - int newTid = 0x80000000; - while (newTid == 0x80000000){ + unsigned int newTid = 0x80000000u; + while (newTid == 0x80000000u){ Util::sleep(100); newTid = ((long)(tmp[6 * bufConnOffset]) << 24) | ((long)(tmp[6 * bufConnOffset + 1]) << 16) | ((long)(tmp[6 * bufConnOffset + 2]) << 8) | tmp[6 * bufConnOffset + 3]; } @@ -202,7 +202,7 @@ namespace Mist { bookKeeping[tNum].keyNum = 0; bookKeeping[tNum].curOffset = 0; } - if (bookKeeping[tNum].curOffset + tmp.size() < curPages[tNum].len){ + if (bookKeeping[tNum].curOffset + tmp.size() < (unsigned long long)curPages[tNum].len){ bookKeeping[tNum].keyNum += (pack.isMember("keyframe") && pack["keyframe"]); memcpy(curPages[tNum].mapped + bookKeeping[tNum].curOffset, tmp.data(), tmp.size()); bookKeeping[tNum].curOffset += tmp.size(); @@ -424,7 +424,7 @@ namespace Mist { stats(); nxtKeyNum[trackId] = pageNum; - if (currKeyOpen.count(trackId) && currKeyOpen[trackId] == pageNum){ + if (currKeyOpen.count(trackId) && currKeyOpen[trackId] == (unsigned int)pageNum){ return; } char id[100]; diff --git a/src/output/output_hds.cpp b/src/output/output_hds.cpp index a27f4bf8..b06deb74 100644 --- a/src/output/output_hds.cpp +++ b/src/output/output_hds.cpp @@ -199,7 +199,7 @@ namespace Mist { if (!audioTrack){getTracks();} unsigned int mstime = 0; unsigned int mslen = 0; - if (fragNum < myMeta.tracks[tid].missedFrags){ + if (fragNum < (unsigned int)myMeta.tracks[tid].missedFrags){ HTTP_S.Clean(); HTTP_S.SetBody("The requested fragment is no longer kept in memory on the server and cannot be served.\n"); HTTP_S.SendResponse("412", "Fragment out of range", myConn); diff --git a/src/output/output_hss.cpp b/src/output/output_hss.cpp index b368f008..00cf0b5b 100644 --- a/src/output/output_hss.cpp +++ b/src/output/output_hss.cpp @@ -102,12 +102,12 @@ namespace Mist { for (std::set::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) { //return "too late" if one track is past this point if (ms < myMeta.tracks[*it].firstms) { - DEBUG_MSG(DLVL_DEVEL, "HSS Canseek to %d returns -1 because track %lu firstms == %d", ms, *it, myMeta.tracks[*it].firstms); + DEBUG_MSG(DLVL_DEVEL, "HSS Canseek to %d returns -1 because track %lu firstms == %llu", ms, *it, myMeta.tracks[*it].firstms); return -1; } //return "too early" if one track is not yet at this point if (ms > myMeta.tracks[*it].lastms) { - DEBUG_MSG(DLVL_DEVEL, "HSS Canseek to %d returns 1 because track %lu lastms == %d", ms, *it, myMeta.tracks[*it].lastms); + DEBUG_MSG(DLVL_DEVEL, "HSS Canseek to %d returns 1 because track %lu lastms == %llu", ms, *it, myMeta.tracks[*it].lastms); return 1; } } @@ -171,12 +171,10 @@ namespace Mist { std::stringstream sstream; int partOffset = 0; - int keyDur = 0; DTSC::Key keyObj; for (std::deque::iterator it = myMeta.tracks[tid].keys.begin(); it != myMeta.tracks[tid].keys.end(); it++) { if (it->getTime() >= seekTime) { keyObj = (*it); - keyDur = it->getLength(); std::deque::iterator nextIt = it; nextIt++; if (nextIt == myMeta.tracks[tid].keys.end()) { diff --git a/src/output/output_hss.h b/src/output/output_hss.h index 15f2d036..5dea5e01 100644 --- a/src/output/output_hss.h +++ b/src/output/output_hss.h @@ -22,7 +22,7 @@ namespace Mist { int keysToSend; int myTrackStor; int myKeyStor; - long long int playUntil; + unsigned long long playUntil; }; } diff --git a/src/output/output_progressive_mp4.cpp b/src/output/output_progressive_mp4.cpp index 532b34d8..4603e323 100644 --- a/src/output/output_progressive_mp4.cpp +++ b/src/output/output_progressive_mp4.cpp @@ -43,10 +43,10 @@ namespace Mist { long long int firstms = -1; long long int lastms = -1; for (std::set::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) { - if (lastms == -1 || lastms < myMeta.tracks[*it].lastms){ + if (lastms == -1 || lastms < (long long)myMeta.tracks[*it].lastms){ lastms = myMeta.tracks[*it].lastms; } - if (firstms == -1 || firstms > myMeta.tracks[*it].firstms){ + if (firstms == -1 || firstms > (long long)myMeta.tracks[*it].firstms){ firstms = myMeta.tracks[*it].firstms; } } @@ -438,7 +438,7 @@ namespace Mist { char * dataPointer = 0; unsigned int len = 0; currentPacket.getString("data", dataPointer, len); - if (currentPacket.getTrackId() != sortSet.begin()->trackID || currentPacket.getTime() != sortSet.begin()->time){ + if ((unsigned long)currentPacket.getTrackId() != sortSet.begin()->trackID || currentPacket.getTime() != sortSet.begin()->time){ if (perfect){ DEBUG_MSG(DLVL_WARN, "Warning: input is inconsistent, playback may not be perfect"); perfect = false; diff --git a/src/output/output_srt.cpp b/src/output/output_srt.cpp index 77397f7c..1fbe5255 100644 --- a/src/output/output_srt.cpp +++ b/src/output/output_srt.cpp @@ -42,11 +42,11 @@ namespace Mist { } long long unsigned int time = currentPacket.getTime(); char tmpBuf[50]; - int tmpLen = sprintf(tmpBuf, "%0.2llu:%0.2llu:%0.2llu,%0.3llu", (time / 3600000), ((time % 3600000) / 60000), (((time % 3600000) % 60000) / 1000), time % 1000); + int tmpLen = sprintf(tmpBuf, "%.2llu:%.2llu:%.2llu,%.3llu", (time / 3600000), ((time % 3600000) / 60000), (((time % 3600000) % 60000) / 1000), time % 1000); tmp.write(tmpBuf, tmpLen); tmp << " --> "; time += currentPacket.getInt("duration"); - tmpLen = sprintf(tmpBuf, "%0.2llu:%0.2llu:%0.2llu,%0.3llu", (time / 3600000), ((time % 3600000) / 60000), (((time % 3600000) % 60000) / 1000), time % 1000); + tmpLen = sprintf(tmpBuf, "%.2llu:%.2llu:%.2llu,%.3llu", (time / 3600000), ((time % 3600000) / 60000), (((time % 3600000) % 60000) / 1000), time % 1000); tmp.write(tmpBuf, tmpLen); tmp << std::endl; myConn.SendNow(tmp.str());