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

zapit/src/scannit.cpp: fix copy-paste; dont change fec, if its FEC_AUTO

Browse Source
This commit is contained in:
[CST] Focus
2012-04-15 16:18:06 +04:00
parent 8bf5fe89fc
commit ccc94e73dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,13 +302,13 @@ bool CNit::ParseSatelliteDescriptor(SatelliteDeliverySystemDescriptor * sd, Tran
feparams.u.qpsk.symbol_rate = sd->getSymbolRate() * 100; feparams.u.qpsk.symbol_rate = sd->getSymbolRate() * 100;
int fec_inner = CFrontend::getCodeRate(sd->getFecInner(), sd->getModulationSystem()); int fec_inner = CFrontend::getCodeRate(sd->getFecInner(), sd->getModulationSystem());
if(sd->getModulation() == 2) if(sd->getModulation() == 2 && ((fe_code_rate_t) fec_inner != FEC_AUTO))
fec_inner += 9; fec_inner += 9;
feparams.u.qpsk.fec_inner = (fe_code_rate_t) fec_inner; feparams.u.qpsk.fec_inner = (fe_code_rate_t) fec_inner;
feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);
freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, false); freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, false);
transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64(
freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId()); freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId());
@@ -333,7 +333,7 @@ bool CNit::ParseCableDescriptor(CableDeliverySystemDescriptor * sd, TransportStr
if(feparams.frequency > 1000*1000) if(feparams.frequency > 1000*1000)
feparams.frequency /= 1000; feparams.frequency /= 1000;
freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, true); freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, true);
transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64(
freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId()); freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId());