1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

If TS packets are not accepted by the output device in Transfer Mode, this is now reported only once per minute in the log file

This commit is contained in:
Klaus Schmidinger 2017-12-07 15:05:48 +01:00
parent c868265397
commit e757f10e44
3 changed files with 16 additions and 4 deletions

View File

@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History
a subdirectory.
- SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details).
2017-12-05: Version 2.3.9
2017-12-07: Version 2.3.9
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
@ -9221,3 +9221,5 @@ Video Disk Recorder Revision History
(suggested by Dietmar Spingler).
- Fixed a lengthy write lock on the Recordings list in case of moving a folder with
more than one recording (thanks to Matthias Senzel).
- If TS packets are not accepted by the output device in Transfer Mode, this is now
reported only once per minute in the log file.

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: transfer.c 4.1 2015/09/05 11:43:58 kls Exp $
* $Id: transfer.c 4.2 2017/12/07 15:00:33 kls Exp $
*/
#include "transfer.h"
@ -14,6 +14,8 @@
cTransfer::cTransfer(const cChannel *Channel)
:cReceiver(Channel, TRANSFERPRIORITY)
{
lastErrorReport = 0;
numLostPackets = 0;
patPmtGenerator.SetChannel(Channel);
}
@ -37,6 +39,7 @@ void cTransfer::Activate(bool On)
#define MAXRETRIES 20 // max. number of retries for a single TS packet
#define RETRYWAIT 5 // time (in ms) between two retries
#define ERRORDELTA 60 // seconds before reporting lost TS packets again
void cTransfer::Receive(const uchar *Data, int Length)
{
@ -51,7 +54,12 @@ void cTransfer::Receive(const uchar *Data, int Length)
cCondWait::SleepMs(RETRYWAIT);
}
DeviceClear();
esyslog("ERROR: TS packet not accepted in Transfer Mode");
numLostPackets++;
if (time(NULL) - lastErrorReport > ERRORDELTA) {
esyslog("ERROR: %d TS packet(s) not accepted in Transfer Mode", numLostPackets);
numLostPackets = 0;
lastErrorReport = time(NULL);
}
}
}

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: transfer.h 4.1 2015/09/05 11:43:08 kls Exp $
* $Id: transfer.h 4.2 2017/12/07 14:56:22 kls Exp $
*/
#ifndef __TRANSFER_H
@ -16,6 +16,8 @@
class cTransfer : public cReceiver, public cPlayer {
private:
time_t lastErrorReport;
int numLostPackets;
cPatPmtGenerator patPmtGenerator;
protected:
virtual void Activate(bool On);