From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 20 Apr 2014 11:10:59 +0000 (+0200)
Subject: SAT>IP: DVB-S setup - pass only configured parameters (fec, rolloff, pilot)
X-Git-Tag: v4.1~2115^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f6c1f7bcfcadde09b1d344add36273067ec99d;p=thirdparty%2Ftvheadend.git

SAT>IP: DVB-S setup - pass only configured parameters (fec, rolloff, pilot)
---

diff --git a/src/input/mpegts/satip/satip_rtsp.c b/src/input/mpegts/satip/satip_rtsp.c
index f02de569c..280ea0245 100644
--- a/src/input/mpegts/satip/satip_rtsp.c
+++ b/src/input/mpegts/satip/satip_rtsp.c
@@ -162,11 +162,18 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe,
       dmc->dmc_fe_delsys == DVB_SYS_DVBS2) {
     satip_rtsp_add_val("sr", buf, dmc->u.dmc_fe_qpsk.symbol_rate);
     ADD(dmc_fe_delsys,              msys,  "dvbs");
-    ADD(dmc_fe_modulation,          mtype, "qpsk");
+    if (dmc->dmc_fe_modulation != DVB_MOD_NONE &&
+        dmc->dmc_fe_modulation != DVB_MOD_AUTO)
+      ADD(dmc_fe_modulation,        mtype, "qpsk");
     ADD(u.dmc_fe_qpsk.polarisation, pol,   "h"   );
-    ADD(u.dmc_fe_qpsk.fec_inner,    fec,   "auto");
-    ADD(dmc_fe_rolloff,             ro,    "0.35");
-    if (dmc->dmc_fe_pilot != DVB_PILOT_AUTO)
+    if (dmc->u.dmc_fe_qpsk.fec_inner != DVB_FEC_NONE &&
+        dmc->u.dmc_fe_qpsk.fec_inner != DVB_FEC_AUTO)
+      ADD(u.dmc_fe_qpsk.fec_inner,  fec,   "auto");
+    if (dmc->dmc_fe_rolloff != DVB_ROLLOFF_NONE &&
+        dmc->dmc_fe_rolloff != DVB_ROLLOFF_AUTO)
+      ADD(dmc_fe_rolloff,           ro,    "0.35");
+    if (dmc->dmc_fe_pilot != DVB_PILOT_NONE &&
+        dmc->dmc_fe_pilot != DVB_PILOT_AUTO)
       ADD(dmc_fe_pilot,             plts,  "auto");
   } else if (dmc->dmc_fe_delsys == DVB_SYS_DVBC_ANNEX_A ||
              dmc->dmc_fe_delsys == DVB_SYS_DVBC_ANNEX_B ||