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

32-bit fixes

Browse source
This commit is contained in:
Thulinma 2019-01-26 00:27:57 +01:00
parent 9e1539a2b9
commit 01d43796ad
28 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/sdp.cpp
View file

@ -654,7 +654,7 @@ namespace SDP{
if (tracks.size()){
for (std::map<uint32_t, Track>::iterator it = tracks.begin(); it != tracks.end(); ++it){
if (!it->second.control.size()){
it->second.control = "/track" + JSON::Value((long long)it->first).asString();
it->second.control = "/track" + JSON::Value(it->first).asString();
INFO_MSG("Control track: %s", it->second.control.c_str());
}

8
lib/ts_stream.cpp
View file

@ -246,7 +246,7 @@ namespace TS{
bool Stream::hasPacket(size_t tid) const {
tthread::lock_guard<tthread::recursive_mutex> guard(tMutex);
std::map<unsigned long, std::deque<Packet> >::const_iterator pesIt = pesStreams.find(tid);
std::map<size_t, std::deque<Packet> >::const_iterator pesIt = pesStreams.find(tid);
if (pesIt == pesStreams.end()){
return false;
}
@ -275,7 +275,7 @@ namespace TS{
}
}
for (std::map<unsigned long, uint32_t>::const_iterator i = seenUnitStart.begin();
for (std::map<size_t, uint32_t>::const_iterator i = seenUnitStart.begin();
i != seenUnitStart.end(); i++){
if (pidToCodec.count(i->first) && i->second > 1){
return true;
@ -327,7 +327,7 @@ namespace TS{
// We now know we're deleting 1 UnitStart, so we can pop the pesPositions and lower the seenUnitStart counter.
--(seenUnitStart[tid]);
std::deque<size_t> &inPositions = pesPositions[tid];
std::deque<uint64_t> &inPositions = pesPositions[tid];
uint64_t bPos = inPositions.front();
inPositions.pop_front();
@ -971,7 +971,7 @@ namespace TS{
}
}
std::set<unsigned long> Stream::getActiveTracks(){
std::set<size_t> Stream::getActiveTracks(){
tthread::lock_guard<tthread::recursive_mutex> guard(tMutex);
std::set<size_t> result;
// Track 0 is always active