Skip to content

Commit

Permalink
opentv: fix missing summaries on "New:" events
Browse files Browse the repository at this point in the history 
Fixes missing summaries when summary data is no longer the first descriptor tag.
This can be observed on eg. Blaze channel when "New:" title sends 0xd0 tag first.

Patch provides:
* fix: missing summaries
* prepare: read series link
* prepare: detect new descriptor
* prepare: detect event description
* white space consistancy clean up
  • Loading branch information
@LraiZer @Huevos
LraiZer authored and Huevos committed Feb 13, 2021
1 parent 237450a commit d4e2259
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 69 deletions.
54 changes: 43 additions & 11 deletions lib/dvb/opentv.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,22 +275,54 @@ uint16_t OpenTvTitleSection::getTitlesListSize(void) const

OpenTvSummary::OpenTvSummary(const uint8_t * const buffer)
{
uint8_t descriptor_tag = buffer[0];
uint16_t bytesLeft = buffer[1];
uint16_t loopLength = 0;
uint16_t pos = 2;

if (descriptor_tag == OPENTV_EVENT_SUMMARY_DESCRIPTOR)
while (bytesLeft > 0 && bytesLeft >= (loopLength = buffer[pos+1]+2))
{
uint8_t descriptorLength = (buffer[1]);
uint8_t descriptor_tag = buffer[pos];
uint8_t descriptorLength = buffer[pos+1];

if (descriptorLength > 0)
switch (descriptor_tag)
{
char tmp[OPENTV_EVENT_SUMMARY_LENGTH];
memset(tmp, '\0', OPENTV_EVENT_SUMMARY_LENGTH);
case OPENTV_EVENT_SUMMARY_DESCRIPTOR:
{
if (descriptorLength > 0)
{
char tmp[OPENTV_EVENT_SUMMARY_LENGTH];
memset(tmp, '\0', OPENTV_EVENT_SUMMARY_LENGTH);

if (!huffman_decode (buffer + 2, descriptorLength, tmp, OPENTV_EVENT_SUMMARY_LENGTH * 2, false))
tmp[0] = '\0';
if (!huffman_decode (buffer+pos+2, descriptorLength, tmp, OPENTV_EVENT_SUMMARY_LENGTH * 2, false))
tmp[0] = '\0';

summary = convertDVBUTF8(tmp, sizeof(tmp), 5);
summary = convertDVBUTF8(tmp, sizeof(tmp), 5);
}
break;
}
case OPENTV_EVENT_DESCRIPTION_DESCRIPTOR:
{
//TODO: read event description descriptor
//mostly unused, huffman_decode same as summary
break;
}
case OPENTV_EVENT_SERIES_LINK_DESCRIPTOR:
{
//TODO: read series link id for future recording
//uint16_t seriesLink = UINT16(&buffer[pos+2]);
break;
}
case 0xd0:
{
//TODO: read first showing 0xbf isNew? event flag
//tag appears sometimes before summary with "New:" prepended titles.
break;
}
default:
break;
}
bytesLeft -= loopLength;
pos += loopLength;
}
}

Expand Down Expand Up @@ -342,9 +374,9 @@ OpenTvSummarySection::OpenTvSummarySection(const uint8_t * const buffer) : LongC
uint8_t descriptor_tag = buffer[pos+2];
uint8_t descriptorLength = buffer[pos+3];

if ((descriptor_tag == OPENTV_DESCRIPTOR_LOOP) && (descriptorLength > 0))
if ((descriptor_tag == OPENTV_DESCRIPTOR_LOOP) && (descriptorLength > 2))
{
OpenTvSummary *summary = new OpenTvSummary(&buffer[pos+4]);
OpenTvSummary *summary = new OpenTvSummary(&buffer[pos+2]);
summary->setChannelId(tableIdExtension);
summary->setEventId(eventId);
summaries.push_back(summary);
Expand Down
118 changes: 60 additions & 58 deletions lib/dvb/opentv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,32 @@
#define OPENTV_LOGICAL_CHANNEL_DESCRIPTOR 0xb1
#define OPENTV_EVENT_TITLE_DESCRIPTOR 0xb5
#define OPENTV_EVENT_SUMMARY_DESCRIPTOR 0xb9
#define OPENTV_EVENT_DESCRIPTION_DESCRIPTOR 0xbb
#define OPENTV_EVENT_SERIES_LINK_DESCRIPTOR 0xc1
#define OPENTV_EVENT_TITLE_LENGTH 0xff
#define OPENTV_EVENT_SUMMARY_LENGTH 0x3ff

class OpenTvChannel
{
protected:
unsigned transportStreamId : 16;
unsigned originalNetworkId : 16;
unsigned serviceId : 16;
unsigned channelId : 16;
unsigned serviceType : 6;

public:
OpenTvChannel(const uint8_t *const buffer);
~OpenTvChannel(void);

uint16_t getTransportStreamId(void) const;
uint16_t getOriginalNetworkId(void) const;
uint16_t getServiceId(void) const;
uint16_t getChannelId(void) const;
uint8_t getServiceType(void) const;

void setTransportStreamId(uint16_t transportstreamid);
void setOriginalNetworkId(uint16_t originalnetworkid);
protected:
unsigned transportStreamId : 16;
unsigned originalNetworkId : 16;
unsigned serviceId : 16;
unsigned channelId : 16;
unsigned serviceType : 6;

public:
OpenTvChannel(const uint8_t *const buffer);
~OpenTvChannel(void);

uint16_t getTransportStreamId(void) const;
uint16_t getOriginalNetworkId(void) const;
uint16_t getServiceId(void) const;
uint16_t getChannelId(void) const;
uint8_t getServiceType(void) const;

void setTransportStreamId(uint16_t transportstreamid);
void setOriginalNetworkId(uint16_t originalnetworkid);
};

typedef std::list<OpenTvChannel *> OpenTvChannelList;
Expand All @@ -40,20 +42,20 @@ typedef OpenTvChannelList::const_iterator OpenTvChannelListConstIterator;

class OpenTvChannelSection : public LongCrcSection , public DescriptorContainer
{
protected:
unsigned descriptorsLength : 12;
unsigned descriptorLength : 8;
unsigned transportDescriptorsLength : 12;
unsigned transportStreamId : 16;
unsigned originalNetworkId : 16;
OpenTvChannelList channels;

public:
OpenTvChannelSection(const uint8_t * const buffer);
~OpenTvChannelSection(void);

const OpenTvChannelList *getChannels(void) const;
uint16_t getChannelsListSize(void) const;
protected:
unsigned descriptorsLength : 12;
unsigned descriptorLength : 8;
unsigned transportDescriptorsLength : 12;
unsigned transportStreamId : 16;
unsigned originalNetworkId : 16;
OpenTvChannelList channels;

public:
OpenTvChannelSection(const uint8_t * const buffer);
~OpenTvChannelSection(void);

const OpenTvChannelList *getChannels(void) const;
uint16_t getChannelsListSize(void) const;
};

class OpenTvTitle : public DescriptorContainer
Expand Down Expand Up @@ -86,18 +88,18 @@ typedef OpenTvTitleList::const_iterator OpenTvTitleListConstIterator;

class OpenTvTitleSection : public LongCrcSection , public DescriptorContainer
{
protected:
unsigned channelId : 16;
unsigned startTimeMjd : 16;
unsigned eventId : 16;
OpenTvTitleList titles;

public:
OpenTvTitleSection(const uint8_t * const buffer);
~OpenTvTitleSection(void);

const OpenTvTitleList *getTitles(void) const;
uint16_t getTitlesListSize(void) const;
protected:
unsigned channelId : 16;
unsigned startTimeMjd : 16;
unsigned eventId : 16;
OpenTvTitleList titles;

public:
OpenTvTitleSection(const uint8_t * const buffer);
~OpenTvTitleSection(void);

const OpenTvTitleList *getTitles(void) const;
uint16_t getTitlesListSize(void) const;
};

class OpenTvSummary : public DescriptorContainer
Expand All @@ -113,7 +115,7 @@ class OpenTvSummary : public DescriptorContainer

std::string getSummary(void) const;
uint16_t getChannelId(void) const;
uint16_t getEventId(void) const;;
uint16_t getEventId(void) const;
void setChannelId(uint16_t channelid);
void setEventId(uint16_t eventId);
};
Expand All @@ -124,18 +126,18 @@ typedef OpenTvSummaryList::const_iterator OpenTvSummaryListConstIterator;

class OpenTvSummarySection : public LongCrcSection , public DescriptorContainer
{
protected:
unsigned channelId : 16;
unsigned startTimeMjd : 16;
unsigned eventId : 16;
OpenTvSummaryList summaries;

public:
OpenTvSummarySection(const uint8_t * const buffer);
~OpenTvSummarySection(void);

const OpenTvSummaryList *getSummaries(void) const;
uint16_t getSummariesListSize(void) const;
protected:
unsigned channelId : 16;
unsigned startTimeMjd : 16;
unsigned eventId : 16;
OpenTvSummaryList summaries;

public:
OpenTvSummarySection(const uint8_t * const buffer);
~OpenTvSummarySection(void);

const OpenTvSummaryList *getSummaries(void) const;
uint16_t getSummariesListSize(void) const;
};

#endif /* __OPENTV_H__ */

0 comments on commit d4e2259

Please sign in to comment.