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

fix DVB-T2

Browse Source
This commit is contained in:
TangoCash
2021-01-17 18:15:02 +01:00
committed by Thilo Graf
parent abe4ff7ded
commit d9f75b45d9
6 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/scan.cpp
View File

@@ -260,8 +260,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
TP.feparams.hierarchy = (fe_hierarchy_t)scansettings.terrestrial_TP_hierarchy;
TP.feparams.delsys = (delivery_system_t)scansettings.terrestrial_TP_delsys;
TP.feparams.plp_id = (unsigned int)atoi(scansettings.terrestrial_TP_pli.c_str());
if (TP.feparams.plp_id == 0)
TP.feparams.plp_id = NO_STREAM_ID_FILTER;
} else if (CFrontend::isCable(delsys)) {
TP.feparams.frequency = atoi(scansettings.cable_TP_freq.c_str());
TP.feparams.symbol_rate = atoi(scansettings.cable_TP_rate.c_str());

4
src/gui/scan_setup.cpp
View File

@@ -2033,7 +2033,7 @@ void CScanSetup::updateManualSettings()
scansettings.terrestrial_TP_transmit_mode = tI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tI->second.feparams.plp_id));
scansettings.terrestrial_TP_pli = to_string(tI->second.feparams.plp_id);
scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
}
@@ -2158,7 +2158,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.terrestrial_TP_transmit_mode = tmpI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tmpI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tmpI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tmpI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tmpI->second.feparams.plp_id));
scansettings.terrestrial_TP_pli = to_string(tmpI->second.feparams.plp_id);
//scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
}
}

1
src/zapit/src/frontend.cpp
View File

@@ -1567,6 +1567,7 @@ int CFrontend::setFrontend(const FrontendParameters *feparams, bool nowait)
#elif defined DTV_DVBT2_PLP_ID
p[cmdseq.num].cmd = DTV_DVBT2_PLP_ID, p[cmdseq.num].u.data = feparams->plp_id, cmdseq.num++;
#endif
INFO("[fe%d/%d] streamid (%d/%d/%d)\n", adapter, fenumber, feparams->plp_id, feparams->pls_code, feparams->pls_mode );
}
break;
default:

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

@@ -453,8 +453,6 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
feparams.guard_interval = (fe_guard_interval_t) xmlGetNumericAttribute(node, "gi", 0);
feparams.hierarchy = (fe_hierarchy_t) xmlGetNumericAttribute(node, "hi", 0);
feparams.plp_id = (unsigned int) xmlGetNumericAttribute(node, "pli", 0);
if (feparams.plp_id == 0)
feparams.plp_id = NO_STREAM_ID_FILTER;
if (feparams.frequency < 1000*1000)
feparams.frequency = feparams.frequency*1000;
@@ -806,8 +804,6 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
xmlGetNumericAttribute(tps, "hierarchy", 0);
feparams.plp_id = (unsigned int)
xmlGetNumericAttribute(tps, "plp_id", 0);
if (feparams.plp_id == 0)
feparams.plp_id = NO_STREAM_ID_FILTER;
if (feparams.frequency < 1000*1000)
feparams.frequency *= 1000;

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

@@ -459,8 +459,6 @@ bool CNit::ParseTerrestrial2Descriptor(T2DeliverySystemDescriptor * sd, Transpor
feparams.delsys = DVB_T2;
feparams.inversion = INVERSION_AUTO;
feparams.plp_id = (unsigned int)sd->getPlpId();
if (feparams.plp_id == 0)
feparams.plp_id = NO_STREAM_ID_FILTER;
feparams.code_rate_HP = CFrontend::getCodeRate(FEC_AUTO, DVB_T2);
feparams.code_rate_LP = CFrontend::getCodeRate(FEC_AUTO, DVB_T2);
feparams.modulation = CFrontend::getConstellation(QAM_AUTO);

33
src/zapit/src/transponder.cpp
View File

@@ -162,23 +162,6 @@ void transponder::dumpServiceXml(FILE * fd)
CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
}
} else if (CFrontend::isTerr(feparams.delsys)) {
if (getFEParams()->plp_id == NO_STREAM_ID_FILTER)
{
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\" sys=\"%hu\">\n",
transport_stream_id, original_network_id,
getFEParams()->frequency,
getFEParams()->inversion,
getFEParams()->bandwidth,
getFEParams()->code_rate_HP,
getFEParams()->code_rate_LP,
getFEParams()->modulation,
getFEParams()->transmission_mode,
getFEParams()->guard_interval,
getFEParams()->hierarchy,
CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
}
else
{
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\" pli=\"%u\" sys=\"%hu\">\n",
transport_stream_id, original_network_id,
getFEParams()->frequency,
@@ -192,7 +175,6 @@ void transponder::dumpServiceXml(FILE * fd)
getFEParams()->hierarchy,
getFEParams()->plp_id,
CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
}
}
}
@@ -233,20 +215,6 @@ void transponder::dump(std::string label)
getFEParams()->delsys);
}
} else if (CFrontend::isTerr(feparams.delsys)) {
if (getFEParams()->plp_id == NO_STREAM_ID_FILTER)
{
printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate_HP %d coderate_LP %d const %d guard %d sys %d\n", label.c_str(),
transponder_id,
getFEParams()->frequency,
getFEParams()->bandwidth,
getFEParams()->code_rate_HP,
getFEParams()->code_rate_LP,
getFEParams()->modulation,
getFEParams()->guard_interval,
getFEParams()->delsys);
}
else
{
printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate_HP %d coderate_LP %d const %d guard %d pli %u sys %d\n", label.c_str(),
transponder_id,
getFEParams()->frequency,
@@ -257,7 +225,6 @@ void transponder::dump(std::string label)
getFEParams()->guard_interval,
getFEParams()->plp_id,
getFEParams()->delsys);
}
}
}