Skip to content

V
vlc
Commit d3a29562 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

ts demux: any teletext type of 1-5 is valid. 

See page 66 of ETSI EN 300 468
(cherry picked from commit a4112126)
parent 0166fd2d
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 7 deletions
modules/demux/ts.c
View file @ d3a29562
...@@ -3377,9 +3377,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -3377,9 +3377,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
for( n = 0; n < sub->i_pages_number; n++ ) for( n = 0; n < sub->i_pages_number; n++ )
{ {
dvbpsi_teletextpage_t *p_page = &sub->p_pages[n]; dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
if( p_page->i_teletext_type == 0x1 || if( p_page->i_teletext_type > 0x0 &&
p_page->i_teletext_type == 0x2 || p_page->i_teletext_type < 0x6 )
p_page->i_teletext_type == 0x5 )
{ {
ts_es_t *p_es; ts_es_t *p_es;
...@@ -3419,9 +3418,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -3419,9 +3418,9 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
{ {
case 0x1: case 0x1:
p_es->fmt.psz_description = p_es->fmt.psz_description =
strdup(_("Teletext initial page")); strdup(_("Teletext"));
msg_Dbg( p_demux, msg_Dbg( p_demux,
" * sub lan=%s page=%d%x", " * ttxt lan=%s page=%d%02x",
p_es->fmt.psz_language, p_es->fmt.psz_language,
p_page->i_teletext_magazine_number, p_page->i_teletext_magazine_number,
p_page->i_teletext_page_number ); p_page->i_teletext_page_number );
...@@ -3431,7 +3430,27 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -3431,7 +3430,27 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
p_es->fmt.psz_description = p_es->fmt.psz_description =
strdup(_("Teletext subtitles")); strdup(_("Teletext subtitles"));
msg_Dbg( p_demux, msg_Dbg( p_demux,
" * sub lan=%s page=%d%x", " * sub lan=%s page=%d%02x",
p_es->fmt.psz_language,
p_page->i_teletext_magazine_number,
p_page->i_teletext_page_number );
break;
case 0x3:
p_es->fmt.psz_description =
strdup(_("Teletext additional information"));
msg_Dbg( p_demux,
" * info lan=%s page=%d%02x",
p_es->fmt.psz_language,
p_page->i_teletext_magazine_number,
p_page->i_teletext_page_number );
break;
case 0x4:
p_es->fmt.psz_description =
strdup(_("Teletext programme schedule"));
msg_Dbg( p_demux,
" * sched lan=%s page=%d%02x",
p_es->fmt.psz_language, p_es->fmt.psz_language,
p_page->i_teletext_magazine_number, p_page->i_teletext_magazine_number,
p_page->i_teletext_page_number ); p_page->i_teletext_page_number );
...@@ -3441,7 +3460,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -3441,7 +3460,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
p_es->fmt.psz_description = p_es->fmt.psz_description =
strdup(_("Teletext hearing impaired subtitles")); strdup(_("Teletext hearing impaired subtitles"));
msg_Dbg( p_demux, msg_Dbg( p_demux,
" * hearing impaired lan=%s page=%d%x", " * hearing impaired lan=%s page=%d%02x",
p_es->fmt.psz_language, p_es->fmt.psz_language,
p_page->i_teletext_magazine_number, p_page->i_teletext_magazine_number,
p_page->i_teletext_page_number ); p_page->i_teletext_page_number );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment