From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 29 Aug 2016 10:23:24 +0000 (+0200)
Subject: dvb_mux_conf_str: add support for ISDB types
X-Git-Tag: v4.2.1~339
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b51103178d774c0e86a3c030d2eb9909da165c2;p=thirdparty%2Ftvheadend.git

dvb_mux_conf_str: add support for ISDB types
---

diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
index be8e76cc9..6a9d49534 100644
--- a/src/input/mpegts/dvb_support.c
+++ b/src/input/mpegts/dvb_support.c
@@ -1045,6 +1045,32 @@ dvb_mux_conf_str_atsc_t ( dvb_mux_conf_t *dmc, char *buf, size_t bufsize )
            dvb_qam2str(dmc->dmc_fe_modulation));
 }
 
+static int
+dvb_mux_conf_str_isdb_t ( dvb_mux_conf_t *dmc, char *buf, size_t bufsize )
+{
+  char hp[16];
+  snprintf(hp, sizeof(hp), "%s", dvb_fec2str(dmc->u.dmc_fe_ofdm.code_rate_HP));
+  return
+  snprintf(buf, bufsize,
+           "%s freq %d bw %s guard %s A (%s,%s,%d,%d) B (%s,%s,%d,%d) C (%s,%s,%d,%d)",
+           dvb_delsys2str(dmc->dmc_fe_delsys),
+           dmc->dmc_fe_freq,
+           dvb_bw2str(dmc->u.dmc_fe_isdbt.bandwidth),
+           dvb_guard2str(dmc->u.dmc_fe_isdbt.guard_interval),
+           dvb_fec2str(dmc->u.dmc_fe_isdbt.layers[0].fec),
+           dvb_qam2str(dmc->u.dmc_fe_isdbt.layers[0].modulation),
+           dmc->u.dmc_fe_isdbt.layers[0].segment_count,
+           dmc->u.dmc_fe_isdbt.layers[0].time_interleaving,
+           dvb_fec2str(dmc->u.dmc_fe_isdbt.layers[1].fec),
+           dvb_qam2str(dmc->u.dmc_fe_isdbt.layers[1].modulation),
+           dmc->u.dmc_fe_isdbt.layers[1].segment_count,
+           dmc->u.dmc_fe_isdbt.layers[1].time_interleaving,
+           dvb_fec2str(dmc->u.dmc_fe_isdbt.layers[2].fec),
+           dvb_qam2str(dmc->u.dmc_fe_isdbt.layers[2].modulation),
+           dmc->u.dmc_fe_isdbt.layers[3].segment_count,
+           dmc->u.dmc_fe_isdbt.layers[3].time_interleaving);
+}
+
 int
 dvb_mux_conf_str ( dvb_mux_conf_t *dmc, char *buf, size_t bufsize )
 {
@@ -1056,11 +1082,14 @@ dvb_mux_conf_str ( dvb_mux_conf_t *dmc, char *buf, size_t bufsize )
     return dvb_mux_conf_str_dvbt(dmc, buf, bufsize);
   case DVB_TYPE_C:
   case DVB_TYPE_ATSC_C:
+  case DVB_TYPE_ISDB_C:
     return dvb_mux_conf_str_dvbc(dmc, buf, bufsize);
   case DVB_TYPE_S:
     return dvb_mux_conf_str_dvbs(dmc, buf, bufsize);
   case DVB_TYPE_ATSC_T:
     return dvb_mux_conf_str_atsc_t(dmc, buf, bufsize);
+  case DVB_TYPE_ISDB_T:
+    return dvb_mux_conf_str_isdb_t(dmc, buf, bufsize);
   default:
     return
       snprintf(buf, bufsize, "UNKNOWN MUX CONFIG");