frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead

Browse Source
This commit is contained in:
Klaus Schmidinger 2017-05-21 09:53:27 +02:00
parent 82813f48c4
commit 3b1b5bde68
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -9042,3 +9042,4 @@ Video Disk Recorder Revision History
VDR's tools.h, you can insert VDR's tools.h, you can insert
#define VDR_NO_STL_PROTOTYPES #define VDR_NO_STL_PROTOTYPES
before including tools.h. before including tools.h.
- Removed TsGetContinuityCounter() from remux.h, using TsContinuityCounter() instead.

4
cutter.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: cutter.c 4.2 2015/08/09 12:24:28 kls Exp $ * $Id: cutter.c 4.3 2017/05/21 09:45:06 kls Exp $
*/ */
#include "cutter.h" #include "cutter.h"
@ -500,7 +500,7 @@ bool cCuttingThread::FixFrame(uchar *Data, int &Length, bool Independent, int In
TsSetContinuityCounter(p, counter[Pid]); TsSetContinuityCounter(p, counter[Pid]);
} }
else else
counter[Pid] = TsGetContinuityCounter(p); // collect initial counters counter[Pid] = TsContinuityCounter(p); // collect initial counters
// Adjust PTS: // Adjust PTS:
int64_t Pts = TsGetPts(p, TS_SIZE); int64_t Pts = TsGetPts(p, TS_SIZE);
if (Pts >= 0) { if (Pts >= 0) {

9
remux.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: remux.h 4.4 2017/04/29 11:56:21 kls Exp $ * $Id: remux.h 4.5 2017/05/21 09:44:52 kls Exp $
*/ */
#ifndef __REMUX_H #ifndef __REMUX_H
@ -95,7 +95,7 @@ inline bool TsIsScrambled(const uchar *p)
return p[3] & TS_SCRAMBLING_CONTROL; return p[3] & TS_SCRAMBLING_CONTROL;
} }
inline uchar TsGetContinuityCounter(const uchar *p) inline uchar TsContinuityCounter(const uchar *p)
{ {
return p[3] & TS_CONT_CNT_MASK; return p[3] & TS_CONT_CNT_MASK;
} }
@ -121,11 +121,6 @@ inline int TsGetPayload(const uchar **p)
return 0; return 0;
} }
inline int TsContinuityCounter(const uchar *p)
{
return p[3] & TS_CONT_CNT_MASK;
}
inline int64_t TsGetPcr(const uchar *p) inline int64_t TsGetPcr(const uchar *p)
{ {
if (TsHasAdaptationField(p)) { if (TsHasAdaptationField(p)) {