From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 7 Jan 2016 15:38:44 +0000 (+0100)
Subject: mpegts network: add missing isdb/dab class handling
X-Git-Tag: v4.2.1~1200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa28e51df3f63e34238dfa2cab285e6bc56ba87b;p=thirdparty%2Ftvheadend.git

mpegts network: add missing isdb/dab class handling
---

diff --git a/src/input/mpegts/mpegts_mux_dvb.c b/src/input/mpegts/mpegts_mux_dvb.c
index f7d21dbd0..44dbda906 100644
--- a/src/input/mpegts/mpegts_mux_dvb.c
+++ b/src/input/mpegts/mpegts_mux_dvb.c
@@ -972,6 +972,18 @@ dvb_mux_create0
   } else if (ln->ln_type == DVB_TYPE_ATSC_C) {
     idc = &dvb_mux_atsc_c_class;
     delsys = DVB_SYS_DVBC_ANNEX_B;
+  } else if (ln->ln_type == DVB_TYPE_ISDB_T) {
+    idc = &dvb_mux_isdb_t_class;
+    delsys = DVB_SYS_ISDBT;
+  } else if (ln->ln_type == DVB_TYPE_ISDB_C) {
+    idc = &dvb_mux_isdb_c_class;
+    delsys = DVB_SYS_ISDBC;
+  } else if (ln->ln_type == DVB_TYPE_ISDB_S) {
+    idc = &dvb_mux_isdb_s_class;
+    delsys = DVB_SYS_ISDBS;
+  } else if (ln->ln_type == DVB_TYPE_DAB) {
+    idc = &dvb_mux_dab_class;
+    delsys = DVB_SYS_DAB;
   } else {
     tvherror("dvb", "unknown FE type %d", ln->ln_type);
     return NULL;
diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
index b2af98ff0..ceaa0641e 100644
--- a/src/input/mpegts/mpegts_network_dvb.c
+++ b/src/input/mpegts/mpegts_network_dvb.c
@@ -893,6 +893,14 @@ const idclass_t *dvb_network_class_by_fe_type(dvb_fe_type_t type)
     return &dvb_network_atsc_t_class;
   else if (type == DVB_TYPE_ATSC_C)
     return &dvb_network_atsc_c_class;
+  else if (type == DVB_TYPE_ISDB_T)
+    return &dvb_network_isdb_t_class;
+  else if (type == DVB_TYPE_ISDB_C)
+    return &dvb_network_isdb_c_class;
+  else if (type == DVB_TYPE_ISDB_S)
+    return &dvb_network_isdb_s_class;
+  else if (type == DVB_TYPE_DAB)
+    return &dvb_network_dab_class;
 
   return NULL;
 }
@@ -909,6 +917,14 @@ dvb_fe_type_t dvb_fe_type_by_network_class(const idclass_t *idc)
     return DVB_TYPE_ATSC_T;
   else if (idc == &dvb_network_atsc_c_class)
     return DVB_TYPE_ATSC_C;
+  else if (idc == &dvb_network_isdb_t_class)
+    return DVB_TYPE_ISDB_T;
+  else if (idc == &dvb_network_isdb_c_class)
+    return DVB_TYPE_ISDB_C;
+  else if (idc == &dvb_network_isdb_s_class)
+    return DVB_TYPE_ISDB_S;
+  else if (idc == &dvb_network_dab_class)
+    return DVB_TYPE_DAB;
 
   return DVB_TYPE_NONE;
 }