fix DVB-T2

Origin commit data
------------------
Commit: f2698347f7
Author: TangoCash <eric@loxat.de>
Date: 2021-01-17 (Sun, 17 Jan 2021)
This commit is contained in:
TangoCash
2021-01-17 18:15:02 +01:00
committed by vanhofen
parent 3b205ad7b1
commit 7d5a8d082c
4 changed files with 1 additions and 8 deletions

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());

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:

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;

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);