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

descriptors.cpp restore original code from master

Browse Source
This commit is contained in:
[CST] Focus
2012-01-20 20:13:02 +04:00
parent 59f31f3568
commit bd36acf89f
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/zapit/src/descriptors.cpp
View File

@@ -251,8 +251,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
transponder_id_t TsidOnid; transponder_id_t TsidOnid;
int modulationSystem, modulationType, rollOff, fec_inner; int modulationSystem, modulationType, rollOff, fec_inner;
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend(); if (CFrontend::getInstance()->getInfo()->type != FE_QPSK)
if (frontend->getInfo()->type != FE_QPSK)
return -1; return -1;
feparams.frequency = feparams.frequency =
@@ -316,8 +315,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
int cable_delivery_system_descriptor(const unsigned char * const buffer, t_transport_stream_id transport_stream_id, t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq) int cable_delivery_system_descriptor(const unsigned char * const buffer, t_transport_stream_id transport_stream_id, t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq)
{ {
transponder_id_t TsidOnid; transponder_id_t TsidOnid;
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend(); if (CFrontend::getInstance()->getInfo()->type != FE_QAM)
if (frontend->getInfo()->type != FE_QAM)
return -1; return -1;
FrontendParameters feparams; FrontendParameters feparams;
@@ -444,9 +442,6 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
CZapitChannel *channel = NULL; CZapitChannel *channel = NULL;
bool tpchange = false; bool tpchange = false;
static transponder_id_t last_tpid = 0; static transponder_id_t last_tpid = 0;
static CPat pat;
//scrambled //scrambled
if(free_ca && scan_fta_flag){ if(free_ca && scan_fta_flag){
return; return;
@@ -629,8 +624,7 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
CZapitBouquet* bouquet; CZapitBouquet* bouquet;
int bouquetId; int bouquetId;
char pname[100]; char pname[100];
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend(); if (CFrontend::getInstance()->getInfo()->type == FE_QPSK)
if (frontend->getInfo()->type == FE_QPSK)
snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str()); snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str());
else else
snprintf(pname, 100, "%s", providerName.c_str()); snprintf(pname, 100, "%s", providerName.c_str());
@@ -660,14 +654,10 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
break; break;
} }
if(CZapit::getInstance()->scanPids()) { if(CZapit::getInstance()->scanPids()) {
if(tpchange) { if(tpchange)
//parse_pat(); parse_pat();
pat.Reset();
pat.Parse();
}
channel->resetPids(); channel->resetPids();
#if 0
if(!pat_get_pmt_pid(channel)) { if(!pat_get_pmt_pid(channel)) {
if(!parse_pmt(channel)) { if(!parse_pmt(channel)) {
//if(channel->getPreAudioPid() == 0 && channel->getVideoPid() == 0) //if(channel->getPreAudioPid() == 0 && channel->getVideoPid() == 0)
@@ -677,15 +667,6 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
} }
} }
} }
#endif
if(pat.Parse(channel)) {
CPmt pmt;
if(!pmt.parse_pmt(channel)) {
if ((channel->getPreAudioPid() != 0) || (channel->getVideoPid() != 0)) {
channel->setPidsFlag();
}
}
}
} }
if(service_type == ST_DIGITAL_TELEVISION_SERVICE && !channel->scrambled) { if(service_type == ST_DIGITAL_TELEVISION_SERVICE && !channel->scrambled) {
CZapit::getInstance()->SetCurrentChannelID(channel->getChannelID()); CZapit::getInstance()->SetCurrentChannelID(channel->getChannelID());
@@ -870,12 +851,11 @@ void subtitling_descriptor(const unsigned char * const)
/* 0x5A */ /* 0x5A */
int terrestrial_delivery_system_descriptor(const unsigned char * const) int terrestrial_delivery_system_descriptor(const unsigned char * const)
{ {
/* TODO */ if (CFrontend::getInstance()->getInfo()->type != FE_OFDM)
#if 0
CFrontend * frontend = CServiceScan::getInstance()->GetFrontend();
if (frontend->getInfo()->type != FE_OFDM)
return -1; return -1;
#endif
/* TODO */
return 0; return 0;
} }