Reverted the change "The EIT filter no longer parses data from "other TS"..."

This commit is contained in:
Klaus Schmidinger 2018-11-15 16:38:14 +01:00
parent 5300077109
commit b9162ad7bd
3 changed files with 9 additions and 6 deletions

View File

@ -3573,3 +3573,6 @@ Helmut Binder <cco@aon.at>
Ulrich Eckhardt <uli@uli-eckhardt.de> Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is for reporting a problem with shutdown after user inactivity in case a plugin is
keeping the OSD open keeping the OSD open
Stian B. Barmen <stian@barmen.nu>
for reporting missing EPG data on channels from Canal Digital Norway

View File

@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
Senzel). Senzel).
- Official release. - Official release.
2018-10-29: Version 2.4.1 2018-11-15: Version 2.4.1
- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported - Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
by Johann Friedrichs). by Johann Friedrichs).
@ -9371,3 +9371,5 @@ Video Disk Recorder Revision History
dvr and demux. Note that in order for this to work, you must not set symbolic dvr and demux. Note that in order for this to work, you must not set symbolic
links like "demux1 -> demux0" and "dvr1 -> dvr0", as is mentioned in some user links like "demux1 -> demux0" and "dvr1 -> dvr0", as is mentioned in some user
manuals of multi frontend DVB cards. manuals of multi frontend DVB cards.
- Reverted the change "The EIT filter no longer parses data from "other TS"...". It led to
missing EPG data on channels from Canal Digital Norway (reported by Stian B. Barmen).

8
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
* *
* $Id: eit.c 4.5 2018/03/31 13:40:32 kls Exp $ * $Id: eit.c 4.6 2018/11/15 16:33:58 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -388,8 +388,7 @@ time_t cEitFilter::disableUntil = 0;
cEitFilter::cEitFilter(void) cEitFilter::cEitFilter(void)
{ {
//Set(0x12, 0x40, 0xC0); // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X) // TODO: remove later Set(0x12, 0x40, 0xC0); // event info now&next actual/other TS (0x4E/0x4F), future actual/other TS (0x5X/0x6X)
Set(0x12, 0x40, 0xE0); // event info now&next actual/other TS (0x4E/0x4F), future actual TS (0x5X)
Set(0x14, 0x70); // TDT Set(0x14, 0x70); // TDT
} }
@ -416,8 +415,7 @@ void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
} }
switch (Pid) { switch (Pid) {
case 0x12: { case 0x12: {
//if (Tid >= 0x4E && Tid <= 0x6F) // TODO: remove later if (Tid >= 0x4E && Tid <= 0x6F)
if (Tid == 0x4E || Tid >= 0x50 && Tid <= 0x5F)
cEIT EIT(sectionSyncerHash, Source(), Tid, Data); cEIT EIT(sectionSyncerHash, Source(), Tid, Data);
} }
break; break;