frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Now processing the "frequency list descriptor"

This commit is contained in:
Klaus Schmidinger 2006-05-27 15:35:16 +02:00
parent ebd579a64a
commit e4d3a28acd
3 changed files with 108 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -1917,3 +1917,6 @@ M. Kiesel <vdr@continuity.cjb.net>
Prakash Punnoor <prakash@punnoor.de> Prakash Punnoor <prakash@punnoor.de>
for suggesting to remove -fPIC from VDR's and libsi's Makefile for suggesting to remove -fPIC from VDR's and libsi's Makefile
Anssi Hannula <anssi.hannula@gmail.com>
for a patch that was used to implement processing the "frequency list descriptor"

1
HISTORY
View File

@ -4739,3 +4739,4 @@ Video Disk Recorder Revision History
- Modifed the device selection to better handle timer conflicts (reported by - Modifed the device selection to better handle timer conflicts (reported by
Christian Wieninger). Christian Wieninger).
- Avoiding a compiler warning in libsi's TypeLoop::operator[]. - Avoiding a compiler warning in libsi's TypeLoop::operator[].
- Now processing the "frequency list descriptor" (based on a patch from Anssi Hannula).

142
nit.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: nit.c 1.11 2006/04/15 14:10:42 kls Exp $ * $Id: nit.c 1.12 2006/05/27 15:35:16 kls Exp $
*/ */
#include "nit.h" #include "nit.h"
@ -48,7 +48,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
if (nits[j].hasTransponder) { if (nits[j].hasTransponder) {
networkId = nits[j].networkId; networkId = nits[j].networkId;
//printf("taking NIT with network ID %d\n", networkId); //printf("taking NIT with network ID %d\n", networkId);
//XXX what if more than one NIT contaisn this transponder??? //XXX what if more than one NIT contains this transponder???
break; break;
} }
} }
@ -95,46 +95,84 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
SI::NIT::TransportStream ts; SI::NIT::TransportStream ts;
for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) { for (SI::Loop::Iterator it; nit.transportStreamLoop.getNext(ts, it); ) {
SI::Descriptor *d; 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 ct = fld->getCodingType();
if (ct > 0) {
int n = 1;
for (SI::Loop::Iterator it3; fld->frequencies.hasNext(it3); ) {
int f = fld->frequencies.getNext(it3);
switch (ct) {
case 1: f = BCD2INT(f) / 100; break;
case 2: f = BCD2INT(f) / 10; break;
case 3: f = f * 10; break;
}
Frequencies[n++] = f;
}
}
else
NumFrequencies = 1;
}
delete fld;
for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) { for (SI::Loop::Iterator it2; (d = ts.transportStreamDescriptors.getNext(it2)); ) {
switch (d->getDescriptorTag()) { switch (d->getDescriptorTag()) {
case SI::SatelliteDeliverySystemDescriptorTag: { case SI::SatelliteDeliverySystemDescriptorTag: {
SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d; SI::SatelliteDeliverySystemDescriptor *sd = (SI::SatelliteDeliverySystemDescriptor *)d;
int Source = cSource::FromData(cSource::stSat, BCD2INT(sd->getOrbitalPosition()), sd->getWestEastFlag()); 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' }; static char Polarizations[] = { 'h', 'v', 'l', 'r' };
char Polarization = Polarizations[sd->getPolarization()]; 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 }; 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 CodeRate = CodeRates[sd->getFecInner()];
int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
if (ThisNIT >= 0) { if (ThisNIT >= 0) {
if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
nits[ThisNIT].hasTransponder = true; if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Transponder())) {
//printf("has transponder %d\n", Transponder()); nits[ThisNIT].hasTransponder = true;
} //printf("has transponder %d\n", Transponder());
break;
}
}
break; break;
} }
bool found = false; bool found = false;
for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { 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 (!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); Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
}
found = true; found = true;
} }
} }
if (!found && Setup.UpdateChannels >= 5) { if (!found && Setup.UpdateChannels >= 5) {
cChannel *Channel = new cChannel; for (int n = 0; n < NumFrequencies; n++) {
Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); cChannel *Channel = new cChannel;
if (Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate)) Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
EITScanner.AddTransponder(Channel); if (Channel->SetSatTransponderData(Source, Frequencies[n], Polarization, SymbolRate, CodeRate))
else EITScanner.AddTransponder(Channel);
delete Channel; else
delete Channel;
}
} }
} }
break; break;
case SI::CableDeliverySystemDescriptorTag: { case SI::CableDeliverySystemDescriptorTag: {
SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d; SI::CableDeliverySystemDescriptor *sd = (SI::CableDeliverySystemDescriptor *)d;
int Source = cSource::FromData(cSource::stCable); int Source = cSource::FromData(cSource::stCable);
int Frequency = BCD2INT(sd->getFrequency()) / 10; int Frequency = Frequencies[0] = BCD2INT(sd->getFrequency()) / 10;
//XXX FEC_outer??? //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 }; 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 CodeRate = CodeRates[sd->getFecInner()];
@ -142,34 +180,48 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
int Modulation = Modulations[min(sd->getModulation(), 6)]; int Modulation = Modulations[min(sd->getModulation(), 6)];
int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10; int SymbolRate = BCD2INT(sd->getSymbolRate()) / 10;
if (ThisNIT >= 0) { if (ThisNIT >= 0) {
if (ISTRANSPONDER(Frequency / 1000, Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
nits[ThisNIT].hasTransponder = true; if (ISTRANSPONDER(Frequencies[n] / 1000, Transponder())) {
//printf("has transponder %d\n", Transponder()); nits[ThisNIT].hasTransponder = true;
} //printf("has transponder %d\n", Transponder());
break;
}
}
break; break;
} }
bool found = false; bool found = false;
for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { 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 (!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); Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
}
found = true; found = true;
} }
} }
if (!found && Setup.UpdateChannels >= 5) { if (!found && Setup.UpdateChannels >= 5) {
cChannel *Channel = new cChannel; for (int n = 0; n < NumFrequencies; n++) {
Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); cChannel *Channel = new cChannel;
if (Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate)) Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
EITScanner.AddTransponder(Channel); if (Channel->SetCableTransponderData(Source, Frequencies[n], Modulation, SymbolRate, CodeRate))
else EITScanner.AddTransponder(Channel);
delete Channel; else
delete Channel;
}
} }
} }
break; break;
case SI::TerrestrialDeliverySystemDescriptorTag: { case SI::TerrestrialDeliverySystemDescriptorTag: {
SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d; SI::TerrestrialDeliverySystemDescriptor *sd = (SI::TerrestrialDeliverySystemDescriptor *)d;
int Source = cSource::FromData(cSource::stTerr); 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 }; 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()]; int Bandwidth = Bandwidths[sd->getBandwidth()];
static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO }; static int Constellations[] = { QPSK, QAM_16, QAM_64, QAM_AUTO };
@ -184,27 +236,41 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO }; static int TransmissionModes[] = { TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K, TRANSMISSION_MODE_AUTO, TRANSMISSION_MODE_AUTO };
int TransmissionMode = TransmissionModes[sd->getTransmissionMode()]; int TransmissionMode = TransmissionModes[sd->getTransmissionMode()];
if (ThisNIT >= 0) { if (ThisNIT >= 0) {
if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
nits[ThisNIT].hasTransponder = true; if (ISTRANSPONDER(Frequencies[n] / 1000000, Transponder())) {
//printf("has transponder %d\n", Transponder()); nits[ThisNIT].hasTransponder = true;
} //printf("has transponder %d\n", Transponder());
break;
}
}
break; break;
} }
bool found = false; bool found = false;
for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { 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 (!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); Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode);
}
found = true; found = true;
} }
} }
if (!found && Setup.UpdateChannels >= 5) { if (!found && Setup.UpdateChannels >= 5) {
cChannel *Channel = new cChannel; for (int n = 0; n < NumFrequencies; n++) {
Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0); cChannel *Channel = new cChannel;
if (Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode)) Channel->SetId(ts.getOriginalNetworkId(), ts.getTransportStreamId(), 0, 0);
EITScanner.AddTransponder(Channel); if (Channel->SetTerrTransponderData(Source, Frequencies[n], Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode))
else EITScanner.AddTransponder(Channel);
delete Channel; else
delete Channel;
}
} }
} }
break; break;