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

src/zapit/src/scansdt.cpp try to fix radio service type

Browse Source
This commit is contained in:
Jacek Jendrzej
2021-07-01 14:30:58 +02:00
parent 890a74175f
commit b8f01e6db0
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/zapit/src/scansdt.cpp
View File

@@ -356,9 +356,6 @@ uint8_t CSdt::FixServiceType(uint8_t type)
(type == 0x82) || (type == 0x87) || (type == 0xd3)) (type == 0x82) || (type == 0x87) || (type == 0xd3))
return ST_DIGITAL_TELEVISION_SERVICE; return ST_DIGITAL_TELEVISION_SERVICE;
if(type == 0x0A)
return ST_DIGITAL_RADIO_SOUND_SERVICE;
return type; return type;
} }
@@ -368,14 +365,22 @@ bool CSdt::ParseServiceDescriptor(ServiceDescription * service, ServiceDescripto
if(SID) if(SID)
printf("=================== PAT: sid %04x ===================\n",SID); printf("=================== PAT: sid %04x ===================\n",SID);
#endif #endif
uint8_t service_type = SID ? 1 : FixServiceType(sd->getServiceType()); uint8_t service_type_tmp = ST_DIGITAL_TELEVISION_SERVICE;
uint8_t real_type = SID ? 1 : sd->getServiceType(); if(sd){
service_type_tmp = sd->getServiceType();
if(service_type_tmp == ST_DIGITAL_RADIO_SOUND_SERVICE || service_type_tmp == 0x0A){
service_type_tmp = ST_DIGITAL_RADIO_SOUND_SERVICE;//change real radio type to 2
}
}
uint8_t service_type = FixServiceType(service_type_tmp);
uint8_t real_type = service_type_tmp;
t_service_id service_id = SID ? SID : service->getServiceId(); t_service_id service_id = SID ? SID : service->getServiceId();
bool free_ca = SID ? 1 : service->getFreeCaMode(); bool free_ca = SID ? 1 : service->getFreeCaMode();
int tsidonid = (transport_stream_id << 16) | original_network_id; int tsidonid = (transport_stream_id << 16) | original_network_id;
std::string providerName = SID ? "" : stringDVBUTF8(sd->getServiceProviderName(), 0, tsidonid); std::string providerName = (SID && !sd) ? "" : stringDVBUTF8(sd->getServiceProviderName(), 0, tsidonid);
std::string serviceName = SID ? "" : stringDVBUTF8(sd->getServiceName(), 0, tsidonid); std::string serviceName = (SID && !sd) ? "" : stringDVBUTF8(sd->getServiceName(), 0, tsidonid);
#ifdef DEBUG_SDT_SERVICE #ifdef DEBUG_SDT_SERVICE
printf("[SDT] sid %04x type %x provider [%s] service [%s] scrambled %d\n", service_id, sd->getServiceType(), printf("[SDT] sid %04x type %x provider [%s] service [%s] scrambled %d\n", service_id, sd->getServiceType(),