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

Fixed TS PTS rollover support

Browse source
This commit is contained in:
Erik Zandvliet 2017-10-25 16:42:13 +02:00 • committed by Thulinma
parent 60e04c4058
commit e4827ce615
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ts_stream.cpp
View file

@ -430,6 +430,13 @@ namespace TS{
} }
} }
timeStamp += (rolloverCount[tid] * TS_PTS_ROLLOVER);
if ((timeStamp < lastms[tid]) && ((timeStamp + TS_PTS_ROLLOVER) > lastms[tid] )){
++rolloverCount[tid];
timeStamp += TS_PTS_ROLLOVER;
}
if (pesHeader[7] & 0x20){// ESCR - ignored if (pesHeader[7] & 0x20){// ESCR - ignored
pesOffset += 6; pesOffset += 6;
@ -454,6 +461,7 @@ namespace TS{
const char *pesPayload = pesHeader + pesOffset; const char *pesPayload = pesHeader + pesOffset;
parseBitstream(tid, pesPayload, realPayloadSize, timeStamp, timeOffset, bPos, pesHeader[6] & 0x04 ); parseBitstream(tid, pesPayload, realPayloadSize, timeStamp, timeOffset, bPos, pesHeader[6] & 0x04 );
lastms[tid] = timeStamp;
// Shift the offset by the payload size, the mandatory headers and the optional // Shift the offset by the payload size, the mandatory headers and the optional
// headers/padding // headers/padding

6
lib/ts_stream.h
View file

@ -7,6 +7,7 @@
#include <set> #include <set>
#include "shared_memory.h" #include "shared_memory.h"
#define TS_PTS_ROLLOVER 95443718
namespace TS{ namespace TS{
enum codecType{H264 = 0x1B, AAC = 0x0F, AC3 = 0x81, MP3 = 0x03, H265 = 0x24, ID3 = 0x15, MPEG2 = 0x02, MP2 = 0x03}; enum codecType{H264 = 0x1B, AAC = 0x0F, AC3 = 0x81, MP3 = 0x03, H265 = 0x24, ID3 = 0x15, MPEG2 = 0x02, MP2 = 0x03};
@ -83,6 +84,11 @@ namespace TS{
std::map<unsigned long, std::string> mpeg2SeqHdr; std::map<unsigned long, std::string> mpeg2SeqHdr;
std::map<unsigned long, std::string> mpeg2SeqExt; std::map<unsigned long, std::string> mpeg2SeqExt;
std::map<unsigned long, std::string> mp2Hdr; std::map<unsigned long, std::string> mp2Hdr;
std::map<unsigned int, size_t> rolloverCount;
std::map<unsigned int, unsigned long long> lastms;
mutable tthread::recursive_mutex tMutex; mutable tthread::recursive_mutex tMutex;
bool threaded; bool threaded;