From 7c2e23d829e216144bc303dc68011e58faf9d0d7 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 13 May 2017 08:29:39 +0200 Subject: [PATCH] satip client: add missing msys=atsc for ATSC clients, fixes #4367 --- src/input/mpegts/satip/satip_rtsp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/input/mpegts/satip/satip_rtsp.c b/src/input/mpegts/satip/satip_rtsp.c index 7aec787e3..71abaa1d2 100644 --- a/src/input/mpegts/satip/satip_rtsp.c +++ b/src/input/mpegts/satip/satip_rtsp.c @@ -78,7 +78,7 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe, { .t = DVB_SYS_DVBS, "dvbs" }, { .t = DVB_SYS_DVBS2, "dvbs2" }, { .t = DVB_SYS_DVBC_ANNEX_A, "dvbc" }, - { .t = DVB_SYS_DVBC_ANNEX_C, "dvbc" }, + { .t = DVB_SYS_DVBC_ANNEX_C, "dvbc2" }, { .t = DVB_SYS_ATSC, "atsc" }, { .t = DVB_SYS_DVBC_ANNEX_B, "dvbcb" }, { .t = TABLE_EOD } @@ -162,21 +162,21 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe, dmc->dmc_fe_delsys == DVB_SYS_DVBS2) { satip_rtsp_add_val("freq", buf, dmc->dmc_fe_freq); satip_rtsp_add_val("sr", buf, dmc->u.dmc_fe_qpsk.symbol_rate); - ADD(dmc_fe_delsys, msys, "dvbs"); + ADD(dmc_fe_delsys, msys, "dvbs"); if (dmc->dmc_fe_modulation != DVB_MOD_NONE && dmc->dmc_fe_modulation != DVB_MOD_AUTO && dmc->dmc_fe_modulation != DVB_MOD_QAM_AUTO) - ADD(dmc_fe_modulation, mtype, "qpsk"); + ADD(dmc_fe_modulation, mtype, "qpsk"); ADD(u.dmc_fe_qpsk.polarisation, pol, "h" ); 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"); + 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"); + 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"); + ADD(dmc_fe_pilot,plts, "auto"); } else if ((flags & SATIP_SETUP_PILOT_ON) != 0 && dmc->dmc_fe_delsys == DVB_SYS_DVBS2) { strcat(buf, "&plts=on"); @@ -186,7 +186,7 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe, dmc->dmc_fe_delsys == DVB_SYS_DVBC_ANNEX_C) { satip_rtsp_add_val("freq", buf, dmc->dmc_fe_freq / 1000); satip_rtsp_add_val("sr", buf, dmc->u.dmc_fe_qam.symbol_rate); - ADD(dmc_fe_delsys, msys, "dvbc"); + ADD(dmc_fe_delsys, msys, "dvbc"); if (dmc->dmc_fe_modulation != DVB_MOD_AUTO && dmc->dmc_fe_modulation != DVB_MOD_NONE && dmc->dmc_fe_modulation != DVB_MOD_QAM_AUTO) @@ -216,9 +216,9 @@ satip_rtsp_setup( http_client_t *hc, int src, int fe, if (dmc->dmc_fe_delsys == DVB_SYS_DVBT2) if (dmc->dmc_fe_stream_id != DVB_NO_STREAM_ID_FILTER) satip_rtsp_add_val("plp", buf, (dmc->dmc_fe_stream_id & 0xff) * 1000); - } else if (dmc->dmc_fe_delsys == DVB_SYS_ATSC || - dmc->dmc_fe_delsys == DVB_SYS_DVBC_ANNEX_B) { + } else if (dmc->dmc_fe_delsys == DVB_SYS_ATSC) { satip_rtsp_add_val("freq", buf, dmc->dmc_fe_freq / 1000); + ADD(dmc_fe_delsys, msys, "atsc"); if (dmc->dmc_fe_modulation != DVB_MOD_AUTO && dmc->dmc_fe_modulation != DVB_MOD_NONE && dmc->dmc_fe_modulation != DVB_MOD_QAM_AUTO) -- 2.47.2