mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/scanbat.cpp: WIP to look at logical numbers in bat

Browse Source
This commit is contained in:
[CST] Focus
2012-03-21 15:00:34 +04:00
parent 1aa8e177d2
commit 95f062d01d
1 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/zapit/src/scanbat.cpp
View File

@@ -26,11 +26,13 @@
#include <dvbsi++/descriptor_tag.h> #include <dvbsi++/descriptor_tag.h>
#include <dvbsi++/bouquet_name_descriptor.h> #include <dvbsi++/bouquet_name_descriptor.h>
#include <dvbsi++/linkage_descriptor.h> #include <dvbsi++/linkage_descriptor.h>
#include <dvbsi++/private_data_specifier_descriptor.h>
#include <math.h> #include <math.h>
#include <eitd/edvbstring.h> #include <eitd/edvbstring.h>
#define DEBUG_BAT #define DEBUG_BAT
#define DEBUG_BAT_UNUSED #define DEBUG_BAT_UNUSED
#define DEBUG_LCN
CBat::CBat(t_satellite_position spos, freq_id_t frq, int dnum) CBat::CBat(t_satellite_position spos, freq_id_t frq, int dnum)
{ {
@@ -152,6 +154,7 @@ bool CBat::Parse()
#ifdef DEBUG_BAT #ifdef DEBUG_BAT
printf("BAT: section %d, %d descriptors\n", bat->getSectionNumber(), dlist->size()); printf("BAT: section %d, %d descriptors\n", bat->getSectionNumber(), dlist->size());
#endif #endif
unsigned int pdsd = 0;
for (dit = dlist->begin(); dit != dlist->end(); ++dit) { for (dit = dlist->begin(); dit != dlist->end(); ++dit) {
Descriptor * d = *dit; Descriptor * d = *dit;
//printf("BAT: parse descriptor %02x len %d\n", d->getTag(), d->getLength()); //printf("BAT: parse descriptor %02x len %d\n", d->getTag(), d->getLength());
@@ -172,8 +175,16 @@ bool CBat::Parse()
#endif #endif
} }
break; break;
case COUNTRY_AVAILABILITY_DESCRIPTOR:
case PRIVATE_DATA_SPECIFIER_DESCRIPTOR: case PRIVATE_DATA_SPECIFIER_DESCRIPTOR:
{
PrivateDataSpecifierDescriptor * pd = (PrivateDataSpecifierDescriptor *)d;
pdsd = pd->getPrivateDataSpecifier();
#ifdef DEBUG_BAT
printf("BAT: private data specifier %08x\n", pdsd);
#endif
}
break;
case COUNTRY_AVAILABILITY_DESCRIPTOR:
default: default:
{ {
#ifdef DEBUG_BAT_UNUSED #ifdef DEBUG_BAT_UNUSED
@@ -204,10 +215,20 @@ bool CBat::Parse()
case SERVICE_LIST_DESCRIPTOR: case SERVICE_LIST_DESCRIPTOR:
ParseServiceList((ServiceListDescriptor *) d, b); ParseServiceList((ServiceListDescriptor *) d, b);
break; break;
#if 1
case LOGICAL_CHANNEL_DESCRIPTOR: case LOGICAL_CHANNEL_DESCRIPTOR:
ParseLogicalChannels((LogicalChannelDescriptor *) d, b); ParseLogicalChannels((LogicalChannelDescriptor *) d, b);
break; break;
#endif
case PRIVATE_DATA_SPECIFIER_DESCRIPTOR:
{
PrivateDataSpecifierDescriptor * pd = (PrivateDataSpecifierDescriptor *)d;
pdsd = pd->getPrivateDataSpecifier();
#ifdef DEBUG_BAT
printf("BAT: private data specifier %08x\n", pdsd);
#endif
}
break;
default: default:
{ {
#ifdef DEBUG_BAT_UNUSED #ifdef DEBUG_BAT_UNUSED
@@ -222,6 +243,18 @@ bool CBat::Parse()
} }
break; break;
} }
switch(pdsd) {
case 0x00000010:
if(d->getTag() == 0x82) {
uint8_t buf[2 + d->getLength()];
d->writeToBuffer(buf);
LogicalChannelDescriptor ld(buf);
ParseLogicalChannels(&ld, b);
}
break;
default:
break;
}
} }
} }
} }
@@ -257,13 +290,16 @@ bool CBat::ParseLogicalChannels(LogicalChannelDescriptor * ld, BouquetAssociatio
for (it = clist.begin(); it != clist.end(); ++it) { for (it = clist.begin(); it != clist.end(); ++it) {
t_service_id service_id = (*it)->getServiceId(); t_service_id service_id = (*it)->getServiceId();
int lcn = (*it)->getLogicalChannelNumber(); int lcn = (*it)->getLogicalChannelNumber();
/* FIXME dont use freq_id / satellitePosition ? */ t_channel_id channel_id = CZapitChannel::makeChannelId(0, 0,
t_channel_id channel_id = CZapitChannel::makeChannelId(satellitePosition, transport_stream_id, original_network_id, service_id);
freq_id, transport_stream_id, original_network_id, service_id);
/* (*it)->getVisibleServiceFlag(); */ /* (*it)->getVisibleServiceFlag(); */
logical_map[channel_id] = lcn; logical_map[channel_id] = lcn;
#ifdef DEBUG_LCN #ifdef DEBUG_LCN
printf("BAT: logical channel tsid %04x onid %04x %llx -> %d\n", transport_stream_id, original_network_id, channel_id, lcn); std::string name;
CZapitChannel * chan = CServiceManager::getInstance()->FindChannel48(channel_id);
if(chan)
name = chan->getName();
printf("BAT: logical channel %05d: tsid %04x onid %04x %016llx [%s]\n", lcn, transport_stream_id, original_network_id, channel_id, name.c_str());
#endif #endif
} }
return true; return true;