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

-fix broken sdt scan

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@940 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2010-12-09 20:41:23 +00:00
parent 7ff73d6bd9
commit 8d7583a61e
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/src/pat.cpp
View File

@@ -114,7 +114,7 @@ int scan_parse_pat( std::vector<std::pair<int,int> > &sidpmt )
} }
} while (filter[4]++ != buffer[7]); } while (filter[4]++ != buffer[7]);
delete dmx; delete dmx;
return -1; return 1;
} }
static unsigned char pbuffer[PAT_SIZE]; static unsigned char pbuffer[PAT_SIZE];

25
src/zapit/src/sdt.cpp
View File

@@ -373,9 +373,6 @@ _repeat:
int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id, int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const t_original_network_id p_original_network_id,
t_satellite_position satellitePosition, freq_id_t freq) t_satellite_position satellitePosition, freq_id_t freq)
{ {
cDemux * dmx = new cDemux();
dmx->Open(DMX_PSI_CHANNEL);
int ret = -1;
unsigned char buffer[SDT_SIZE]; unsigned char buffer[SDT_SIZE];
@@ -397,30 +394,36 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
int tmp_free_CA_mode = -1; int tmp_free_CA_mode = -1;
unsigned char filter[DMX_FILTER_SIZE]; unsigned char filter[DMX_FILTER_SIZE];
unsigned char mask[DMX_FILTER_SIZE]; unsigned char mask[DMX_FILTER_SIZE];
memset(filter, 0x00, DMX_FILTER_SIZE);
memset(mask, 0x00, DMX_FILTER_SIZE);
filter[0] = 0x42; filter[0] = 0x42;
filter[1] = (p_transport_stream_id >> 8) & 0xff; filter[1] = (p_transport_stream_id >> 8) & 0xff;
filter[2] = p_transport_stream_id & 0xff; filter[2] = p_transport_stream_id & 0xff;
filter[3] = 0x00; // filter[3] = 0x00;
filter[4] = 0x00; filter[4] = 0x00;
filter[5] = 0x00; filter[5] = 0x00;
filter[6] = (p_original_network_id >> 8) & 0xff; filter[6] = (p_original_network_id >> 8) & 0xff;
filter[7] = p_original_network_id & 0xff; filter[7] = p_original_network_id & 0xff;
memset(&filter[8], 0x00, 8); //memset(&filter[8], 0x00, 8);
mask[0] = 0xFF; mask[0] = 0xFF;
mask[1] = 0xFF; mask[1] = 0xFF;
mask[2] = 0xFF; mask[2] = 0xFF;
mask[3] = 0x00; // mask[3] = 0x00;
mask[4] = 0xFF; mask[4] = 0xFF;
mask[5] = 0x00; mask[5] = 0xFF;
mask[6] = 0xFF; mask[6] = 0xFF;
mask[7] = 0xFF; mask[7] = 0xFF;
memset(&mask[8], 0x00, 8); // memset(&mask[8], 0x00, 8);
std::vector<std::pair<int,int> > sidpmt; std::vector<std::pair<int,int> > sidpmt;
scan_parse_pat( sidpmt ); int pat_ok = scan_parse_pat( sidpmt );
cDemux * dmx = new cDemux();
dmx->Open(DMX_PSI_CHANNEL);
int ret = -1;
do { do {
if ((dmx->sectionFilter(0x11, filter, mask, 8) < 0) || (dmx->Read(buffer, SDT_SIZE) < 0)) { if ((dmx->sectionFilter(0x11, filter, mask, 8) < 0) || (dmx->Read(buffer, SDT_SIZE) < 0)) {
delete dmx; delete dmx;
@@ -438,7 +441,7 @@ int parse_current_sdt( const t_transport_stream_id p_transport_stream_id, const
EIT_schedule_flag = buffer[pos + 2] & 0x02; EIT_schedule_flag = buffer[pos + 2] & 0x02;
EIT_present_following_flag = buffer[pos + 2] & 0x01; EIT_present_following_flag = buffer[pos + 2] & 0x01;
running_status = buffer [pos + 3] & 0xE0; running_status = buffer [pos + 3] & 0xE0;
for (unsigned short i=0; i<sidpmt.size(); i++){ for (unsigned short i=0; i<sidpmt.size() && pat_ok == 1; i++){
if(sidpmt[i].first == service_id && running_status != 32 ){ if(sidpmt[i].first == service_id && running_status != 32 ){
tmp_free_CA_mode = scan_parse_pmt( sidpmt[i].second, sidpmt[i].first ); tmp_free_CA_mode = scan_parse_pmt( sidpmt[i].second, sidpmt[i].first );
} }

4
src/zapit/src/zapit.cpp
View File

@@ -2477,7 +2477,9 @@ printf("[sdt monitor] wakeup...\n");
printf("[sdt monitor] TP already updated.\n"); printf("[sdt monitor] TP already updated.\n");
continue; continue;
} }
curchans.clear(); if(!curchans.empty())
curchans.clear();
ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq); ret = parse_current_sdt(transport_stream_id, original_network_id, satellitePosition, freq);
if(ret) if(ret)
continue; continue;