Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mpegts network: add missing isdb/dab class handling
  • Loading branch information
perexg committed Jan 7, 2016
1 parent 95eb29a commit aa28e51
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/input/mpegts/mpegts_mux_dvb.c
Expand Up @@ -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;
Expand Down
16 changes: 16 additions & 0 deletions src/input/mpegts/mpegts_network_dvb.c
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit aa28e51

Please sign in to comment.