From 3d55d3045ef136e4cb3ccec0f00a13858c570dff Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 17 Mar 2021 10:59:36 +0100 Subject: [PATCH] Decreased the scrambling timeout for CAMs known to decrypt a certain channel --- HISTORY | 2 ++ device.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 8eaa6569..a6201031 100644 --- a/HISTORY +++ b/HISTORY @@ -9614,3 +9614,5 @@ Video Disk Recorder Revision History - When checking whether a particular recording has already been made by a pattern timer, the characters ' ' (blank), ':' and '-' are now ignored, making "TITLE - EPISODE" and "TITLE: EPISODE" the same. +- Decreased the scrambling timeout for CAMs known to decrypt a certain channel, so + that it won't collide with MAXBROKENTIMEOUT in recorder.c. diff --git a/device.c b/device.c index 7553c5ba..b2a85944 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 5.1 2021/01/11 10:36:05 kls Exp $ + * $Id: device.c 5.2 2021/03/17 10:59:36 kls Exp $ */ #include "device.h" @@ -1802,7 +1802,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver) Receiver->scramblingTimeout = TS_SCRAMBLING_TIMEOUT; bool KnownToDecrypt = ChannelCamRelations.CamDecrypt(Receiver->ChannelID(), camSlot->MasterSlotNumber()); if (KnownToDecrypt) - Receiver->scramblingTimeout *= 10; // give it time to receive ECM/EMM + Receiver->scramblingTimeout *= 9; // give it time to receive ECM/EMM (must be less than MAXBROKENTIMEOUT in recorder.c!) if (Receiver->ChannelID().Valid()) dsyslog("CAM %d: %sknown to decrypt channel %s (scramblingTimeout = %ds)", camSlot->MasterSlotNumber(), KnownToDecrypt ? "" : "not ", *Receiver->ChannelID().ToString(), Receiver->scramblingTimeout); }