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

mpegts: fix debug display bug and event firing

Browse source 
(cherry picked from commit 293542812ac05ee6b806444b9def7212f28ae9b2)
This commit is contained in:
Adam Sutton 2013-08-23 22:50:55 +01:00
parent fab386a14b
commit e5140a9c75
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts/dvb_psi.c
View file

@ -423,7 +423,7 @@ dvb_table_complete
struct mpegts_table_state *st;
tvhtrace(mt->mt_name, "status: ");
RB_FOREACH(st, &mt->mt_state, link) {
tvhtrace(mt->mt_name, " tableid %02X extraid %04X sect %2d last %2d ver %2d complete %d",
tvhtrace(mt->mt_name, " tableid %02X extraid %08X sect %2d last %2d ver %2d complete %d",
st->tableid, st->extraid, st->section, st->last, st->version, st->complete);
if (!st->complete)
p = 1;
@ -472,7 +472,6 @@ dvb_table_begin
return -1;
tvhtrace(mt->mt_name, "tableid %02X len %d", tableid, len);
tvhlog_hexdump(mt->mt_name, ptr, len);
/* Section info */
if (sect) {
@ -481,6 +480,7 @@ dvb_table_begin
*ver = (ptr[2] >> 1) & 0x1F;
tvhtrace(mt->mt_name, " extraid %08X", extraid);
tvhtrace(mt->mt_name, " section %d last %d ver %d", *sect, *last, *ver);
tvhlog_hexdump(mt->mt_name, ptr, len);
st = mpegts_table_state_find(mt, tableid, extraid);
/* New version */
@ -503,6 +503,8 @@ dvb_table_begin
tvhtrace(mt->mt_name, " skip, wrong section");
return -1;
}
} else {
tvhlog_hexdump(mt->mt_name, ptr, len);
}
return 1;

2
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
View file

@ -678,8 +678,8 @@ linuxdvb_frontend_tune0
assert(LIST_FIRST(&lfe->mi_mux_active) == NULL);
/* Open FE */
lfe->mi_display_name((mpegts_input_t*)lfe, buf1, sizeof(buf1));
if (lfe->lfe_fe_fd <= 0) {
lfe->mi_display_name((mpegts_input_t*)lfe, buf1, sizeof(buf1));
lfe->lfe_fe_fd = tvh_open(lfe->lfe_fe_path, O_RDWR | O_NONBLOCK, 0);
tvhtrace("linuxdvb", "%s - opening FE %s (%d)", buf1, lfe->lfe_fe_path, lfe->lfe_fe_fd);
if (lfe->lfe_fe_fd <= 0) {

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

@ -95,6 +95,9 @@ mpegts_mux_instance_start ( mpegts_mux_instance_t **mmiptr )
tvhdebug("mpegts", "%s - started", buf);
mmi->mmi_input->mi_started_mux(mmi->mmi_input, mmi);
/* Event handler */
mpegts_fire_event(mm, ml_mux_start);
/* Initial scanning */
if (mm->mm_initial_scan_status == MM_SCAN_PENDING) {
tvhtrace("mpegts", "%s - adding to current scan Q", buf);