mpegts network/mux: add ISDB-[TCS] and DAB definitions

tvheadend · Jan 7, 2016 · 0634f61 · 0634f61
1 parent f65b842
commit 0634f61
Show file tree

Hide file tree

Showing 5 changed files with 472 additions and 214 deletions.
diff --git a/src/input/mpegts/dvb.h b/src/input/mpegts/dvb.h
@@ -380,7 +380,11 @@ typedef enum dvb_fe_type {
   DVB_TYPE_S,			/* satellite */
   DVB_TYPE_ATSC_T,		/* terrestrial - north america */
   DVB_TYPE_ATSC_C,		/* cable - north america */
-  DVB_TYPE_LAST = DVB_TYPE_ATSC_C
+  DVB_TYPE_ISDB_T,              /* terrestrial - japan, brazil */
+  DVB_TYPE_ISDB_C,              /* cable - japan, brazil */
+  DVB_TYPE_ISDB_S,              /* satellite - japan, brazil */
+  DVB_TYPE_DAB,                 /* digital radio (europe) */
+  DVB_TYPE_LAST = DVB_TYPE_DAB
 } dvb_fe_type_t;
 
 typedef enum dvb_fe_spectral_inversion {
@@ -558,6 +562,17 @@ typedef struct dvb_ofdm_config {
   dvb_fe_hierarchy_t      hierarchy_information;
 } dvb_ofdm_config_t;
 
+typedef struct dvb_isdbt_config {
+  dvb_fe_bandwidth_t      bandwidth;
+  dvb_fe_guard_interval_t guard_interval;
+  struct {
+    dvb_fe_code_rate_t    fec;
+    dvb_fe_modulation_t   modulation;
+    int                   segment_count;
+    int                   time_interleaving;
+  } layers[3];
+} dvb_isdbt_config_t;
+
 typedef struct dvb_mux_conf
 {
   dvb_fe_type_t               dmc_fe_type;
@@ -574,6 +589,7 @@ typedef struct dvb_mux_conf
     dvb_qpsk_config_t         dmc_fe_qpsk;
     dvb_qam_config_t          dmc_fe_qam;
     dvb_ofdm_config_t         dmc_fe_ofdm;
+    dvb_isdbt_config_t        dmc_fe_isdbt;
   } u;
 
   // For scan file configurations

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
@@ -2586,7 +2586,10 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
   case DVB_SYS_DVBT2:
   case DVB_SYS_DVBS:
   case DVB_SYS_DVBS2:
+  case DVB_SYS_ISDBT:
+  case DVB_SYS_ISDBC:
   case DVB_SYS_ISDBS:
+  case DVB_SYS_DAB:
     psi_tables_dvb(mm);
     break;
   case DVB_SYS_TURBO:
@@ -2599,12 +2602,9 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm,
     break;
   case DVB_SYS_NONE:
   case DVB_SYS_DVBH:
-  case DVB_SYS_ISDBT:
-  case DVB_SYS_ISDBC:
   case DVB_SYS_DTMB:
   case DVB_SYS_CMMB:
   case DVB_SYS_DSS:
-  case DVB_SYS_DAB:
     break;
   case DVB_SYS_ATSC_ALL:
     psi_tables_atsc_c(mm);

diff --git a/src/input/mpegts/mpegts_dvb.h b/src/input/mpegts/mpegts_dvb.h
@@ -50,6 +50,10 @@ extern const idclass_t dvb_network_dvbc_class;
 extern const idclass_t dvb_network_dvbs_class;
 extern const idclass_t dvb_network_atsc_t_class;
 extern const idclass_t dvb_network_atsc_c_class;
+extern const idclass_t dvb_network_isdb_t_class;
+extern const idclass_t dvb_network_isdb_c_class;
+extern const idclass_t dvb_network_isdb_s_class;
+extern const idclass_t dvb_network_dab_class;
 
 void dvb_network_init ( void );
 void dvb_network_done ( void );
@@ -79,6 +83,10 @@ extern const idclass_t dvb_mux_dvbc_class;
 extern const idclass_t dvb_mux_dvbs_class;
 extern const idclass_t dvb_mux_atsc_t_class;
 extern const idclass_t dvb_mux_atsc_c_class;
+extern const idclass_t dvb_mux_isdb_t_class;
+extern const idclass_t dvb_mux_isdb_c_class;
+extern const idclass_t dvb_mux_isdb_s_class;
+extern const idclass_t dvb_mux_dab_class;
 
 dvb_mux_t *dvb_mux_create0
   (dvb_network_t *ln, uint16_t onid, uint16_t tsid,