frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling NITs with more than one delivery system descriptor tag for the same transponder

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-10-28 12:38:13 +02:00
parent af0e7a6193
commit 6bee1b1f3d
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -4978,3 +4978,5 @@ Video Disk Recorder Revision History
2006-10-28: Version 1.4.3-4 2006-10-28: Version 1.4.3-4
- Fixed deleting EPG events that have a running status of "pausing" or higher. - Fixed deleting EPG events that have a running status of "pausing" or higher.
- Fixed handling NITs with more than one delivery system descriptor tag for the
same transponder.

50
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.12 2006/05/27 15:35:16 kls Exp $ * $Id: nit.c 1.13 2006/10/28 12:31:04 kls Exp $
*/ */
#include "nit.h" #include "nit.h"
@ -144,15 +144,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
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())) { if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) {
if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) {
break; Frequency = Frequencies[n];
break;
}
} }
} }
Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
} }
Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate);
} }
found = true; found = true;
} }
@ -193,15 +195,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
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())) { if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) {
if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) {
break; Frequency = Frequencies[n];
break;
}
} }
} }
Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
} }
Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate);
} }
found = true; found = true;
} }
@ -249,15 +253,17 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
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())) { if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder
for (int n = 0; n < NumFrequencies; n++) { if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) {
if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { for (int n = 0; n < NumFrequencies; n++) {
Frequency = Frequencies[n]; if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) {
break; 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;
} }