frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

The cutter now only increments the TS continuity counter for packets that have a payload

This commit is contained in:
Klaus Schmidinger 2012-11-27 08:57:45 +01:00
parent 4db9a3b636
commit 2eadd7d4dd
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2973,6 +2973,8 @@ S
for reporting that cCuttingThread::GetPendingPackets() should get only non-video
packets
for pointing out that the name H264 should be used instead of MPEG4
for pointing out that the cutter should only increment the TS continuity counter for
packets that have a payload
Peter Münster <pmlists@free.fr>
for fixing 'make install' to not overwrite existing configuration files

4
HISTORY
View File

@ -7339,7 +7339,7 @@ Video Disk Recorder Revision History
- Modified editing marks are now written to disk whenever the replay progress display
gets hidden (thanks to Christoph Haubrich).
2012-11-26: Version 1.7.33
2012-11-27: Version 1.7.33
- In order to be able to play TS recordings from other sources, in which there is
more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed
@ -7351,3 +7351,5 @@ Video Disk Recorder Revision History
- Changed all occurrences of MPEG4 to H264 (pointed out by Sören Moch).
- Fixed getting the number of editing sequences in case the last sequence has no actual
end mark.
- The cutter now only increments the TS continuity counter for packets that have a
payload (pointed out by Sören Moch).

5
cutter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: cutter.c 2.18 2012/11/25 13:59:07 kls Exp $
* $Id: cutter.c 2.19 2012/11/26 17:21:14 kls Exp $
*/
#include "cutter.h"
@ -210,7 +210,8 @@ void cPtsFixer::Fix(uchar *Data, int Length, bool CutIn)
}
// Adjust the TS continuity counter:
if (fixCounters) {
counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
if (TsHasPayload(p))
counter[Pid] = (counter[Pid] + 1) & TS_CONT_CNT_MASK;
TsSetContinuityCounter(p, counter[Pid]);
}
else