From patchwork Sat May 27 14:11:36 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klaus Schmidinger X-Patchwork-Id: 12321 Received: from raven.cadsoft.de ([217.7.101.211]) by www.linuxtv.org with esmtp (Exim 4.50) id 1FjzW2-0004a1-14 for vdr@linuxtv.org; Sat, 27 May 2006 16:11:42 +0200 Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10]) by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id k4REBcOn003802 for ; Sat, 27 May 2006 16:11:39 +0200 Message-ID: <44785E18.2030006@cadsoft.de> Date: Sat, 27 May 2006 16:11:36 +0200 From: Klaus Schmidinger Organization: CadSoft Computer GmbH User-Agent: Thunderbird 1.5.0.2 (X11/20060420) MIME-Version: 1.0 To: vdr@linuxtv.org Subject: Re: [vdr] VDR constantly tries to change transponder frequency References: <43B412AD.8020902@gmail.com> <43C13381.4030800@gmail.com> <43C13986.3070008@cadsoft.de> <44677A5E.4000805@gmail.com> <44679FA5.9030108@cadsoft.de> <44777651.1030906@gmail.com> <44784A54.1050604@cadsoft.de> In-Reply-To: <44784A54.1050604@cadsoft.de> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (raven.cadsoft.de [192.168.1.1]); Sat, 27 May 2006 16:11:40 +0200 (CEST) X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2006 14:11:42 -0000 Status: O X-Status: X-Keywords: X-UID: 9607 Klaus Schmidinger wrote: > Anssi Hannula wrote: >> ... >> Okay, attached is a patch for nit.c that checks for all the frequencies >> in frequency_list_descriptor for the channel's frequency and if found, >> use it so that channel's frequency is not changed. >> >> Also in the detection of new transponders all frequencies are added for >> the EITscanner. >> >> I tested it by removing a transponder from channels.conf, and VDR found >> it again (though it took a while, as there are *many* frequencies in the >> frequency_list_descriptor). This too hasn't been working before on the >> DVB-T network of Finland. >> ... Please test whether the attached version of the patch still works. Since none of the satellites I can receive uses the FrequencyListDescriptor, and I don't have cable or terrestrial signals, I can't test it myself. If it's ok like this for you, I would include it in tomorrow's maintenance patch. Note that I had to make a small change to libsi/si.h in order to avoid a compiler warning. Klaus --- nit.c 2006/04/15 14:10:42 1.11 +++ nit.c 2006/05/27 14:03:49 @@ -95,46 +95,77 @@ SI::NIT::TransportStream ts; for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) { SI::Descriptor *d; + + SI::Loop::Iterator it2; + SI::FrequencyListDescriptor *fld = (SI::FrequencyListDescriptor *)ts.transportStreamDescriptors.getNext(it2, SI::FrequencyListDescriptorTag); + int NumFrequencies = fld ? fld->frequencies.getCount() + 1 : 1; + int Frequencies[NumFrequencies]; + if (fld) { + int n = 1; + for (SI::Loop::Iterator it3; fld->frequencies.hasNext(it3); ) { + int f = fld->frequencies.getNext(it3); + int ct = fld->getCodingType(); + if (ct < 3) + f = BCD2INT(f) / (ct == 1 ? 100 : 10); + Frequencies[n++] = f; + } + } + delete fld; + for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) { switch (d->getDescriptorTag()) { case SI::SatelliteDeliverySystemDescriptorTag: { SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d; int Source = cSource::FromData(cSource::stSat, BCD2INT(sd->getOrbitalPosition()), sd->getWestEastFlag()); - int Frequency = BCD2INT(sd->getFrequency()) / 100; + int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 100; static char Polarizations[] = { 'h', 'v', 'l', 'r' }; char Polarization = Polarizations[sd->getPolarization()]; static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE }; int CodeRate = CodeRates[sd->getFecInner()]; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; if (ThisNIT >= 0) { - if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { - nits[ThisNIT].hasTransponder = true; - //printf("has transponder %d\n", Transponder()); - } + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Transponder())) { + nits[ThisNIT].hasTransponder = true; + //printf("has transponder %d\n", Transponder()); + break; + } + } break; } bool found = false; for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { - if (Setup.UpdateChannels >= 5) + if (Setup.UpdateChannels >= 5) { + if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } + } + } Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); + } found = true; } } if (!found && Setup.UpdateChannels >= 5) { - cChannel *Channel = new cChannel; - Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); - if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate)) - EITScanner.AddTransponder(Channel); - else - delete Channel; + for (int n = 0; n < NumFrequencies; n++) { + cChannel *Channel = new cChannel; + Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); + if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate)) + EITScanner.AddTransponder(Channel); + else + delete Channel; + } } } break; case SI::CableDeliverySystemDescriptorTag: { SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d; int Source = cSource::FromData(cSource::stCable); - int Frequency = BCD2INT(sd->getFrequency()) / 10; + int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10; //XXX FEC_outer??? static int CodeRates[] = { FEC_NONE, FEC_1_2, FEC_2_3, FEC_3_4, FEC_5_6, FEC_7_8, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE }; int CodeRate = CodeRates[sd->getFecInner()]; @@ -142,34 +173,48 @@ int Modulation = Modulations[min(sd->getModulation(), 6)]; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; if (ThisNIT >= 0) { - if (ISTRANSPONDER(Frequency / 1000, Transponder())) { - nits[ThisNIT].hasTransponder = true; - //printf("has transponder %d\n", Transponder()); - } + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000, Transponder())) { + nits[ThisNIT].hasTransponder = true; + //printf("has transponder %d\n", Transponder()); + break; + } + } break; } bool found = false; for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { - if (Setup.UpdateChannels >= 5) + if (Setup.UpdateChannels >= 5) { + if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } + } + } Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate); + } found = true; } } if (!found && Setup.UpdateChannels >= 5) { - cChannel *Channel = new cChannel; - Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); - if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate)) - EITScanner.AddTransponder(Channel); - else - delete Channel; + for (int n = 0; n < NumFrequencies; n++) { + cChannel *Channel = new cChannel; + Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); + if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate)) + EITScanner.AddTransponder(Channel); + else + delete Channel; + } } } break; case SI::TerrestrialDeliverySystemDescriptorTag: { SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d; int Source = cSource::FromData(cSource::stTerr); - int Frequency = sd->getFrequency() * 10; + int Frequency = Frequencies[0] = sd->getFrequency() * 10; static int Bandwidths[] = { BANDWIDTH_8_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_6_MHZ, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO, BANDWIDTH_AUTO }; int Bandwidth = Bandwidths[sd->getBandwidth()]; static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO }; @@ -184,27 +229,41 @@ static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO }; int TransmissionMode = TransmissionModes[sd->getTransmissionMode()]; if (ThisNIT >= 0) { - if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { - nits[ThisNIT].hasTransponder = true; - //printf("has transponder %d\n", Transponder()); - } + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) { + nits[ThisNIT].hasTransponder = true; + //printf("has transponder %d\n", Transponder()); + break; + } + } break; } bool found = false; for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { - if (Setup.UpdateChannels >= 5) + if (Setup.UpdateChannels >= 5) { + if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; + } + } + } Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); + } found = true; } } if (!found && Setup.UpdateChannels >= 5) { - cChannel *Channel = new cChannel; - Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); - if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode)) - EITScanner.AddTransponder(Channel); - else - delete Channel; + for (int n = 0; n < NumFrequencies; n++) { + cChannel *Channel = new cChannel; + Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); + if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode)) + EITScanner.AddTransponder(Channel); + else + delete Channel; + } } } break; --- libsi/si.h 2006/04/14 10:53:44 1.14 +++ libsi/si.h 2006/05/27 13:07:20 @@ -399,6 +399,7 @@ case 8: return (SixtyFourBit(data.FourBytes(index)) << 32) | data.FourBytes(index+4); } + return 0; // just to avoid a compiler warning } T getNext(Iterator &it) const {