vlc | branch: master | Francois Cartegnie <[email protected]> | Sat Feb 27 22:11:48 2016 +0100| [4eb6f4b036edd72d05257c22cce302f1fa8b5bd6] | committer: Francois Cartegnie
demux: ts: add defines for sdt runstatus > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4eb6f4b036edd72d05257c22cce302f1fa8b5bd6 --- modules/demux/mpeg/ts_psi_eit.c | 8 ++++---- modules/demux/mpeg/ts_psi_eit.h | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/demux/mpeg/ts_psi_eit.c b/modules/demux/mpeg/ts_psi_eit.c index a45eea7..7f1128d 100644 --- a/modules/demux/mpeg/ts_psi_eit.c +++ b/modules/demux/mpeg/ts_psi_eit.c @@ -351,12 +351,12 @@ static void EITCallBack( demux_t *p_demux, i_start += timezone; // FIXME: what about DST? i_tot_time += timezone; - if( p_evt->i_running_status == 0x00 && + if( p_evt->i_running_status == TS_PSI_RUNSTATUS_UNDEFINED && (i_start - 5 < i_tot_time && i_tot_time < i_start + i_duration + 5) ) { - p_evt->i_running_status = 0x04; - msg_Dbg( p_demux, " EIT running status 0x00 -> 0x04" ); + p_evt->i_running_status = TS_PSI_RUNSTATUS_RUNNING; + msg_Dbg( p_demux, " EIT running status undefined -> running" ); } } @@ -478,7 +478,7 @@ static void EITCallBack( demux_t *p_demux, *psz_extra ? psz_extra : NULL, i_min_age ); /* Update "now playing" field */ - if( p_evt->i_running_status == 0x04 && i_start > 0 && psz_name && psz_text ) + if( p_evt->i_running_status == TS_PSI_RUNSTATUS_RUNNING && i_start > 0 && psz_name && psz_text ) vlc_epg_SetCurrent( p_epg, i_start ); free( psz_name ); diff --git a/modules/demux/mpeg/ts_psi_eit.h b/modules/demux/mpeg/ts_psi_eit.h index 88f2886..864f4c2 100644 --- a/modules/demux/mpeg/ts_psi_eit.h +++ b/modules/demux/mpeg/ts_psi_eit.h @@ -21,6 +21,12 @@ //#define PSI_DEBUG_EIT +#define TS_PSI_RUNSTATUS_UNDEFINED 0x00 +#define TS_PSI_RUNSTATUS_STOPPED 0x01 +#define TS_PSI_RUNSTATUS_STARTING 0x02 +#define TS_PSI_RUNSTATUS_PAUSING 0x03 +#define TS_PSI_RUNSTATUS_RUNNING 0x04 + bool AttachDvbpsiNewEITTableHandler( dvbpsi_t *p_handle, demux_t * p_demux ); #endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
