mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

SIsections: add parsing of PDC descriptor (VPS time)

Browse Source 
Tdd the VPS time to the event if available. Not yet used for anything
useful ;-)

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@888 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-11-20 14:10:52 +00:00
parent b1fefb0e60
commit f6e1539d43
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sectionsd/SIevents.hpp
View File

@@ -90,6 +90,14 @@ struct descr_linkage_header {
unsigned linkage_type : 8; unsigned linkage_type : 8;
} __attribute__ ((packed)) ; } __attribute__ ((packed)) ;
struct descr_pdc_header {
unsigned descriptor_tag : 8;
unsigned descriptor_length : 8;
unsigned pil0 : 8;
unsigned pil1 : 8;
unsigned pil2 : 8;
} __attribute__ ((packed)) ;
class SIlinkage { class SIlinkage {
public: public:
SIlinkage(const struct descr_linkage_header *link) { SIlinkage(const struct descr_linkage_header *link) {
@@ -344,6 +352,7 @@ public:
original_network_id = 0; original_network_id = 0;
transport_stream_id = 0; transport_stream_id = 0;
eventID = 0; eventID = 0;
vps = 0;
// dauer=0; // dauer=0;
// startzeit=0; // startzeit=0;
} }
@@ -383,6 +392,7 @@ public:
SIparentalRatings ratings; SIparentalRatings ratings;
SIlinkage_descs linkage_descs; SIlinkage_descs linkage_descs;
SItimes times; SItimes times;
time_t vps;
// Der Operator zum sortieren // Der Operator zum sortieren
bool operator < (const SIevent& e) const { bool operator < (const SIevent& e) const {
return uniqueKey()<e.uniqueKey(); return uniqueKey()<e.uniqueKey();

26
src/sectionsd/SIsections.cpp
View File

@@ -170,6 +170,30 @@ void SIsectionEIT::parseLinkageDescriptor(const char *buf, SIevent &e, unsigned
} }
} }
void SIsectionEIT::parsePDCDescriptor(const char *buf, SIevent &e, unsigned maxlen)
{
if (maxlen >= sizeof(struct descr_pdc_header))
{
const struct descr_pdc_header *s = (struct descr_pdc_header *)buf;
time_t now = time(NULL);
struct tm tm_r;
struct tm t = *localtime_r(&now, &tm_r); // this initializes the time zone in 't'
t.tm_isdst = -1; // makes sure mktime() will determine the correct DST setting
int month = t.tm_mon;
t.tm_mon = ((s->pil1 >> 3) & 0x0F) - 1;
t.tm_mday = ((s->pil0 & 0x0F) << 1) | ((s->pil1 & 0x80) >> 7);
t.tm_hour = ((s->pil1 & 0x07) << 2) | ((s->pil2 & 0xC0) >> 6);
t.tm_min = s->pil2 & 0x3F;
t.tm_sec = 0;
if (month == 11 && t.tm_mon == 0) // current month is dec, but event is in jan
t.tm_year++;
else if (month == 0 && t.tm_mon == 11) // current month is jan, but event is in dec
t.tm_year--;
e.vps = mktime(&t);
// fprintf(stderr, "SIsectionEIT::parsePDCDescriptor: vps: %ld %s", e.vps, ctime(&e.vps));
}
}
void SIsectionEIT::parseComponentDescriptor(const char *buf, SIevent &e, unsigned maxlen) void SIsectionEIT::parseComponentDescriptor(const char *buf, SIevent &e, unsigned maxlen)
{ {
if(maxlen>=sizeof(struct descr_component_header)) if(maxlen>=sizeof(struct descr_component_header))
@@ -454,6 +478,8 @@ void SIsectionEIT::parseDescriptors(const char *des, unsigned len, SIevent &e)
parseParentalRatingDescriptor((const char *)desc, e, len); parseParentalRatingDescriptor((const char *)desc, e, len);
else if(desc->descriptor_tag==0x4A) else if(desc->descriptor_tag==0x4A)
parseLinkageDescriptor((const char *)desc, e, len); parseLinkageDescriptor((const char *)desc, e, len);
else if(desc->descriptor_tag==0x69)
parsePDCDescriptor((const char *)desc, e, len);
if((unsigned)(desc->descriptor_length+2)>len) if((unsigned)(desc->descriptor_length+2)>len)
break; break;
len-=desc->descriptor_length+2; len-=desc->descriptor_length+2;

1
src/sectionsd/SIsections.hpp
View File

@@ -544,6 +544,7 @@ protected:
void parseComponentDescriptor(const char *buf, SIevent &e, unsigned maxlen); void parseComponentDescriptor(const char *buf, SIevent &e, unsigned maxlen);
void parseParentalRatingDescriptor(const char *buf, SIevent &e, unsigned maxlen); void parseParentalRatingDescriptor(const char *buf, SIevent &e, unsigned maxlen);
void parseLinkageDescriptor(const char *buf, SIevent &e, unsigned maxlen); void parseLinkageDescriptor(const char *buf, SIevent &e, unsigned maxlen);
void parsePDCDescriptor(const char *buf, SIevent &e, unsigned maxlen);
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
std::string freesatHuffmanDecode(std::string input); std::string freesatHuffmanDecode(std::string input);
#endif #endif