summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2008-12-20 11:05:22 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2008-12-20 11:05:22 +0100
commit7702a6c7e30dab3cab062e385f503a06f2038271 (patch)
tree96bc2209ce5df97d7d3f31e245bcb96d7ccb134b
parent5cbc33d89772b5e4d67abc473fafa7de7eb4e7be (diff)
downloadvdr-7702a6c7e30dab3cab062e385f503a06f2038271.tar.gz
vdr-7702a6c7e30dab3cab062e385f503a06f2038271.tar.bz2
Fixed handling modulation types for DVB-S transponders when processing the NIT
-rw-r--r--HISTORY1
-rw-r--r--nit.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 96c41b25..d2adef99 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5854,3 +5854,4 @@ Video Disk Recorder Revision History
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
- Fixed handling the 'pointer field' in generating and parsing PAT/PMT (thanks to
Frank Schmirler).
+- Fixed handling modulation types for DVB-S transponders when processing the NIT.
diff --git a/nit.c b/nit.c
index 5155f2a0..2ec89609 100644
--- a/nit.c
+++ b/nit.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: nit.c 2.2 2008/12/06 15:46:50 kls Exp $
+ * $Id: nit.c 2.3 2008/12/20 10:57:50 kls Exp $
*/
#include "nit.h"
@@ -129,7 +129,7 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
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_8_9, FEC_3_5, FEC_4_5, FEC_9_10, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_AUTO, FEC_NONE };
int CodeRate = CodeRates[sd->getFecInner()];
- static int Modulations[] = { QPSK, PSK_8, QAM_16 };
+ static int Modulations[] = { QAM_AUTO, QPSK, PSK_8, QAM_16 };
int Modulation = Modulations[sd->getModulationType()];
int System = sd->getModulationSystem() ? SYS_DVBS2 : SYS_DVBS;
static int RollOffs[] = { ROLLOFF_35, ROLLOFF_25, ROLLOFF_20, ROLLOFF_AUTO };