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

Externally provided EPG data (with table ID 0x00) now gets its component descriptors set from the broadcast data

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-02-19 09:51:02 +01:00
parent 91a5940bc4
commit b5bbfe0589
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1421,6 +1421,8 @@ Andreas Brugger <brougs78@gmx.net>
are being edited via the menu are being edited via the menu
for suggesting to change the API of the functions cStatus::Recording() and for suggesting to change the API of the functions cStatus::Recording() and
cStatus::Replaying(), so that they can provide the full file name of the recording cStatus::Replaying(), so that they can provide the full file name of the recording
for suggesting that externally provided EPG data (with table ID 0x00) shall get its
component descriptors set from the broadcast data
Dino Ravnic <dino.ravnic@fer.hr> Dino Ravnic <dino.ravnic@fer.hr>
for fixing some characters in the iso8859-2 font file for fixing some characters in the iso8859-2 font file

3
HISTORY
View File

@ -4346,3 +4346,6 @@ Video Disk Recorder Revision History
- If a recording starts and there is no EPG data available for the recorded channel, - If a recording starts and there is no EPG data available for the recorded channel,
the 'X' audio component records for the 'info.vdr' file are now generated from the the 'X' audio component records for the 'info.vdr' file are now generated from the
channel's PID data. channel's PID data.
- Externally provided EPG data (with table ID 0x00) now gets its component
descriptors set from the broadcast data, so that language codes and descriptions
are available (suggested by Andreas Brugger).

31
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 1.114 2006/01/14 15:41:21 kls Exp $ * $Id: eit.c 1.115 2006/02/19 09:51:02 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -39,11 +39,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
bool Empty = true; bool Empty = true;
bool Modified = false; bool Modified = false;
bool HasExternalData = false;
time_t SegmentStart = 0; time_t SegmentStart = 0;
time_t SegmentEnd = 0; time_t SegmentEnd = 0;
SI::EIT::Event SiEitEvent; SI::EIT::Event SiEitEvent;
for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) { for (SI::Loop::Iterator it; eventLoop.getNext(SiEitEvent, it); ) {
bool ExternalData = false;
// Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number. // Drop bogus events - but keep NVOD reference events, where all bits of the start time field are set to 1, resulting in a negative number.
if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0) if (SiEitEvent.getStartTime() == 0 || SiEitEvent.getStartTime() > 0 && SiEitEvent.getDuration() == 0)
continue; continue;
@ -66,11 +68,14 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
pEvent->SetSeen(); pEvent->SetSeen();
// If the existing event has a zero table ID it was defined externally and shall // If the existing event has a zero table ID it was defined externally and shall
// not be overwritten. // not be overwritten.
if (pEvent->TableID() == 0x00) if (pEvent->TableID() == 0x00) {
continue; if (pEvent->Version() == getVersionNumber())
continue;
HasExternalData = ExternalData = true;
}
// If the new event has a higher table ID, let's skip it. // If the new event has a higher table ID, let's skip it.
// The lower the table ID, the more "current" the information. // The lower the table ID, the more "current" the information.
if (Tid > pEvent->TableID()) else if (Tid > pEvent->TableID())
continue; continue;
// If the new event comes from the same table and has the same version number // If the new event comes from the same table and has the same version number
// as the existing one, let's skip it to avoid unnecessary work. // as the existing one, let's skip it to avoid unnecessary work.
@ -78,15 +83,16 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
// the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on // the actual Premiere transponder and the Sat.1/Pro7 transponder), but use different version numbers on
// each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned // each of them :-( So if one DVB card is tuned to the Premiere transponder, while an other one is tuned
// to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers. // to the Sat.1/Pro7 transponder, events will keep toggling because of the bogus version numbers.
if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber()) else if (Tid == pEvent->TableID() && pEvent->Version() == getVersionNumber())
continue; continue;
} }
// XXX TODO log different (non-zero) event IDs for the same event??? if (!ExternalData) {
pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-( pEvent->SetEventID(SiEitEvent.getEventId()); // unfortunately some stations use different event ids for the same event in different tables :-(
pEvent->SetTableID(Tid); pEvent->SetTableID(Tid);
pEvent->SetStartTime(SiEitEvent.getStartTime());
pEvent->SetDuration(SiEitEvent.getDuration());
}
pEvent->SetVersion(getVersionNumber()); pEvent->SetVersion(getVersionNumber());
pEvent->SetStartTime(SiEitEvent.getStartTime());
pEvent->SetDuration(SiEitEvent.getDuration());
int LanguagePreferenceShort = -1; int LanguagePreferenceShort = -1;
int LanguagePreferenceExt = -1; int LanguagePreferenceExt = -1;
@ -97,6 +103,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
cLinkChannels *LinkChannels = NULL; cLinkChannels *LinkChannels = NULL;
cComponents *Components = NULL; cComponents *Components = NULL;
for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) { for (SI::Loop::Iterator it2; (d = SiEitEvent.eventDescriptors.getNext(it2)); ) {
if (ExternalData && d->getDescriptorTag() != SI::ComponentDescriptorTag)
continue;
switch (d->getDescriptorTag()) { switch (d->getDescriptorTag()) {
case SI::ExtendedEventDescriptorTag: { case SI::ExtendedEventDescriptorTag: {
SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d; SI::ExtendedEventDescriptor *eed = (SI::ExtendedEventDescriptor *)d;
@ -243,7 +251,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
pSchedule->SetPresentSeen(); pSchedule->SetPresentSeen();
if (Modified) { if (Modified) {
pSchedule->Sort(); pSchedule->Sort();
pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber()); if (!HasExternalData)
pSchedule->DropOutdated(SegmentStart, SegmentEnd, Tid, getVersionNumber());
Schedules->SetModified(pSchedule); Schedules->SetModified(pSchedule);
} }
} }