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

Fix TS inputs taking more and more memory over time in some cases

Browse source
This commit is contained in:
Thulinma 2022-08-11 13:17:13 +02:00
parent 8aceff951d
commit 54a46146c2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ts_stream.cpp
View file

@ -190,7 +190,8 @@ namespace TS{
uint32_t tid = newPack.getPID(); uint32_t tid = newPack.getPID();
bool unitStart = newPack.getUnitStart(); bool unitStart = newPack.getUnitStart();
static uint32_t wantPrev = 0; static uint32_t wantPrev = 0;
bool wantTrack = ((wantPrev == tid) || (tid == 0 || newPack.isPMT(pmtTracks) || pidToCodec.count(tid))); bool isData = pidToCodec.count(tid);
bool wantTrack = ((wantPrev == tid) || (tid == 0 || newPack.isPMT(pmtTracks) || isData));
if (!wantTrack){return;} if (!wantTrack){return;}
if (psCacheTid != tid || !psCache){ if (psCacheTid != tid || !psCache){
psCache = &(pesStreams[tid]); psCache = &(pesStreams[tid]);
@ -199,7 +200,7 @@ namespace TS{
if (unitStart || !psCache->empty()){ if (unitStart || !psCache->empty()){
wantPrev = tid; wantPrev = tid;
psCache->push_back(newPack); psCache->push_back(newPack);
if (unitStart){ if (unitStart && isData){
pesPositions[tid].push_back(bytePos); pesPositions[tid].push_back(bytePos);
++(seenUnitStart[tid]); ++(seenUnitStart[tid]);
} }
@ -210,7 +211,7 @@ namespace TS{
if (tid == 0){return false;} if (tid == 0){return false;}
{ {
tthread::lock_guard<tthread::recursive_mutex> guard(tMutex); tthread::lock_guard<tthread::recursive_mutex> guard(tMutex);
return !pmtTracks.count(tid); return pidToCodec.count(tid);
} }
} }
@ -280,6 +281,11 @@ namespace TS{
} }
if (!pidToCodec.count(tid)){ if (!pidToCodec.count(tid)){
pesStreams.erase(tid);
pesPositions.erase(tid);
seenUnitStart.erase(tid);
psCacheTid = 0;
psCache = 0;
return; // skip unknown codecs return; // skip unknown codecs
} }