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

Style fix for cpp03 compatible mode

Browse source
This commit is contained in:
Thulinma 2017-05-12 14:08:59 +02:00
parent 392a83838a
commit d05cca687c
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ts_stream.cpp
View file

@ -122,7 +122,7 @@ namespace TS{
void Stream::finish(){ void Stream::finish(){
if (!pesStreams.size()){return;} if (!pesStreams.size()){return;}
for (std::map<unsigned long, std::deque<Packet>>::const_iterator i = pesStreams.begin(); for (std::map<unsigned long, std::deque<Packet> >::const_iterator i = pesStreams.begin();
i != pesStreams.end(); i++){ i != pesStreams.end(); i++){
parsePES(i->first, true); parsePES(i->first, true);
} }
@ -191,7 +191,7 @@ namespace TS{
// Handle PMT packets // Handle PMT packets
if (pmtTracks.count(tid)){ if (pmtTracks.count(tid)){
///\todo Keep track of updates in PMT instead of keeping only the last PMT per program as a ///\todo Keep track of updates in PMT instead of keeping only the last PMT per program as a
///reference /// reference
if (threaded){globalSem.wait();} if (threaded){globalSem.wait();}
mappingTable[tid] = trackPackets.back(); mappingTable[tid] = trackPackets.back();
lastPMT[tid] = Util::bootSecs(); lastPMT[tid] = Util::bootSecs();
@ -318,7 +318,8 @@ namespace TS{
} }
if (outPackets.size()){ if (outPackets.size()){
for (std::map<unsigned long, std::deque<DTSC::Packet>>::const_iterator i = outPackets.begin(); for (std::map<unsigned long, std::deque<DTSC::Packet> >::const_iterator i =
outPackets.begin();
i != outPackets.end(); i++){ i != outPackets.end(); i++){
if (i->second.size()){ if (i->second.size()){
if (threaded){globalSem.post();} if (threaded){globalSem.post();}
@ -327,7 +328,7 @@ namespace TS{
} }
} }
for (std::map<unsigned long, std::deque<Packet>>::const_iterator i = pesStreams.begin(); for (std::map<unsigned long, std::deque<Packet> >::const_iterator i = pesStreams.begin();
i != pesStreams.end(); i++){ i != pesStreams.end(); i++){
std::deque<Packet>::const_iterator curPack = i->second.begin(); std::deque<Packet>::const_iterator curPack = i->second.begin();
@ -804,7 +805,7 @@ namespace TS{
unsigned long packTime = 0xFFFFFFFFull; unsigned long packTime = 0xFFFFFFFFull;
unsigned long packTrack = 0; unsigned long packTrack = 0;
for (std::map<unsigned long, std::deque<DTSC::Packet>>::iterator it = outPackets.begin(); for (std::map<unsigned long, std::deque<DTSC::Packet> >::iterator it = outPackets.begin();
it != outPackets.end(); it++){ it != outPackets.end(); it++){
if (it->second.front().getTime() < packTime){ if (it->second.front().getTime() < packTime){
packTrack = it->first; packTrack = it->first;

6
lib/ts_stream.h
View file

@ -68,9 +68,9 @@ namespace TS{
std::map<unsigned long, unsigned long long> lastPMT; std::map<unsigned long, unsigned long long> lastPMT;
std::map<unsigned long, ProgramMappingTable> mappingTable; std::map<unsigned long, ProgramMappingTable> mappingTable;
std::map<unsigned long, std::deque<Packet>> pesStreams; std::map<unsigned long, std::deque<Packet> > pesStreams;
std::map<unsigned long, std::deque<unsigned long long>> pesPositions; std::map<unsigned long, std::deque<unsigned long long> > pesPositions;
std::map<unsigned long, std::deque<DTSC::Packet>> outPackets; std::map<unsigned long, std::deque<DTSC::Packet> > outPackets;
std::map<unsigned long, DTSC::Packet> buildPacket; std::map<unsigned long, DTSC::Packet> buildPacket;
std::map<unsigned long, unsigned long> pidToCodec; std::map<unsigned long, unsigned long> pidToCodec;
std::map<unsigned long, aac::adts> adtsInfo; std::map<unsigned long, aac::adts> adtsInfo;