stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

epggrab / mpegts mux: allow to force EPG scan per mux

Browse source
This commit is contained in:
Jaroslav Kysela 2014-07-01 09:18:52 +02:00
parent 26705e9310
commit fad7bbe0fa
6 changed files with 86 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/epggrab.h
View file

@ -212,7 +212,8 @@ struct epggrab_ota_map
LIST_ENTRY(epggrab_ota_map) om_link;
epggrab_module_ota_t *om_module;
int om_complete;
int om_first;
uint8_t om_first;
uint8_t om_forced;
uint64_t om_tune_count;
RB_HEAD(,epggrab_ota_svc_link) om_svcs; ///< Muxes we carry data for
};

2
src/epggrab/module/eit.c
View file

@ -662,7 +662,7 @@ static void _eit_start
int pid, opts = 0;
/* Disabled */
if (!m->enabled) return;
if (!m->enabled && !map->om_forced) return;
/* Freeview (switch to EIT, ignore if explicitly enabled) */
// Note: do this as PID is the same

2
src/epggrab/module/opentv.c
View file

@ -552,7 +552,7 @@ static void _opentv_start
};
/* Ignore */
if (!m->enabled) return;
if (!m->enabled && !map->om_forced) return;
if (mod->tsid != mm->mm_tsid) return;
/* Install tables */

60
src/epggrab/otamux.c
View file

@ -140,15 +140,27 @@ epggrab_ota_done ( epggrab_ota_mux_t *om, int reason )
}
static void
epggrab_ota_start ( epggrab_ota_mux_t *om, int grace )
epggrab_ota_start ( epggrab_ota_mux_t *om, mpegts_mux_t *mm, int grace,
const char *modname )
{
epggrab_module_t *m;
epggrab_ota_map_t *map;
TAILQ_INSERT_TAIL(&epggrab_ota_active, om, om_q_link);
gtimer_arm(&om->om_timer, epggrab_ota_timeout_cb, om,
epggrab_ota_timeout_get() + grace);
if (modname) {
LIST_FOREACH(m, &epggrab_modules, link)
if (!strcmp(m->id, modname)) {
epggrab_ota_register((epggrab_module_ota_t *)m, om, mm);
break;
}
}
LIST_FOREACH(map, &om->om_modules, om_link) {
map->om_first = 1;
map->om_forced = 0;
if (modname && !strcmp(modname, map->om_module->id))
map->om_forced = 1;
map->om_complete = 0;
tvhdebug(map->om_module->id, "grab started");
}
@ -315,7 +327,20 @@ epggrab_ota_kick_cb ( void *p )
mpegts_network_t *net;
int failed;
} networks[64], *net; /* more than 64 networks? - you're a king */
int i, r, networks_count = 0;
int i, r, networks_count = 0, epg_flag;
const char *modname;
static const char *modnames[] = {
[MM_EPG_DISABLE] = NULL,
[MM_EPG_ENABLE] = NULL,
[MM_EPG_FORCE] = NULL,
[MM_EPG_FORCE_EIT] = "eit",
[MM_EPG_FORCE_UK_FREESAT] = "uk_freesat",
[MM_EPG_FORCE_UK_FREEVIEW] = "uk_freeview",
[MM_EPG_FORCE_VIASAT_BALTIC] = "viasat_baltic",
[MM_EPG_FORCE_OPENTV_SKY_UK] = "opentv-skyuk",
[MM_EPG_FORCE_OPENTV_SKY_ITALIA] = "opentv-skyit",
[MM_EPG_FORCE_OPENTV_SKY_AUSAT] = "opentv-ausat",
};
lock_assert(&global_lock);
@ -347,7 +372,12 @@ next_one:
net->failed = 0;
}
if (mm->mm_is_epg(mm) <= 0) {
epg_flag = mm->mm_is_epg(mm);
if (ARRAY_SIZE(modnames) >= epg_flag)
epg_flag = MM_EPG_ENABLE;
modname = modnames[epg_flag];
if (epg_flag < 0 || epg_flag == MM_EPG_DISABLE) {
#if TRACE_ENABLE
char name[256];
mm->mm_display_name(mm, name, sizeof(name));
@ -356,16 +386,18 @@ next_one:
goto done;
}
/* Check we have modules attached and enabled */
LIST_FOREACH(map, &om->om_modules, om_link) {
if (map->om_module->tune(map, om, mm))
break;
}
if (!map) {
char name[256];
mm->mm_display_name(mm, name, sizeof(name));
tvhdebug("epggrab", "no modules attached to %s, check again next time", name);
goto done;
if (epg_flag != MM_EPG_FORCE) {
/* Check we have modules attached and enabled */
LIST_FOREACH(map, &om->om_modules, om_link) {
if (map->om_module->tune(map, om, mm))
break;
}
if (!map) {
char name[256];
mm->mm_display_name(mm, name, sizeof(name));
tvhdebug("epggrab", "no modules attached to %s, check again next time", name);
goto done;
}
}
/* Subscribe to the mux */
@ -377,7 +409,7 @@ next_one:
first = om;
} else {
mpegts_mux_instance_t *mmi = mm->mm_active;
epggrab_ota_start(om, mpegts_input_grace(mmi->mmi_input, mm));
epggrab_ota_start(om, mm, mpegts_input_grace(mmi->mmi_input, mm), modname);
}
done:

14
src/input/mpegts.h
View file

@ -299,6 +299,20 @@ typedef enum mpegts_mux_scan_result
MM_SCAN_FAIL
} mpegts_mux_scan_result_t;
enum mpegts_mux_epg_flag
{
MM_EPG_DISABLE,
MM_EPG_ENABLE,
MM_EPG_FORCE,
MM_EPG_FORCE_EIT,
MM_EPG_FORCE_UK_FREESAT,
MM_EPG_FORCE_UK_FREEVIEW,
MM_EPG_FORCE_VIASAT_BALTIC,
MM_EPG_FORCE_OPENTV_SKY_UK,
MM_EPG_FORCE_OPENTV_SKY_ITALIA,
MM_EPG_FORCE_OPENTV_SKY_AUSAT,
};
/* Multiplex */
struct mpegts_mux
{

25
src/input/mpegts/mpegts_mux.c
View file

@ -293,6 +293,24 @@ mpegts_mux_class_enabled_notify ( void *p )
}
}
static htsmsg_t *
mpegts_mux_epg_list ( void *o )
{
static const struct strtab tab[] = {
{ "Disable", MM_EPG_DISABLE },
{ "Enable (auto)", MM_EPG_ENABLE },
{ "Force (auto)", MM_EPG_FORCE },
{ "Force EIT", MM_EPG_FORCE_EIT },
{ "Force UK Freesat", MM_EPG_FORCE_UK_FREESAT },
{ "Force UK Freeview", MM_EPG_FORCE_UK_FREEVIEW },
{ "Force Viasat Baltic", MM_EPG_FORCE_VIASAT_BALTIC },
{ "Force OpenTV Sky UK", MM_EPG_FORCE_OPENTV_SKY_UK },
{ "Force OpenTV Sky Italia", MM_EPG_FORCE_OPENTV_SKY_ITALIA },
{ "Force OpenTV Sky Ausat", MM_EPG_FORCE_OPENTV_SKY_AUSAT },
};
return strtab2htsmsg(tab);
}
const idclass_t mpegts_mux_class =
{
.ic_class = "mpegts_mux",
@ -311,11 +329,12 @@ const idclass_t mpegts_mux_class =
.notify = mpegts_mux_class_enabled_notify,
},
{
.type = PT_BOOL,
.type = PT_INT,
.id = "epg",
.name = "EPG",
.name = "EPG Scan",
.off = offsetof(mpegts_mux_t, mm_epg),
.def.i = 1,
.def.i = MM_EPG_ENABLE,
.list = mpegts_mux_epg_list,
},
{
.type = PT_STR,