Skip to content

V
vlc
Commit ba1cc7ac authored by Simon Hailes's avatar Simon Hailes Committed by Jean-Baptiste Kempf
Browse files
Options

Extended PSI DVB subtitle types to include 0x14/0x28 (indicates DDS present in HD spec) 

Patch corrected by <jb@videolan.org>
parent 2a605427
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/demux/ts.c
View file @ ba1cc7ac
...@@ -3358,8 +3358,8 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, ...@@ -3358,8 +3358,8 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ ) for( int i = 0; p_sub && i < p_sub->i_subtitles_number; i++ )
{ {
const int i_type = p_sub->p_subtitle[i].i_subtitling_type; const int i_type = p_sub->p_subtitle[i].i_subtitling_type;
if( ( i_type >= 0x10 && i_type <= 0x13 ) || if( ( i_type >= 0x10 && i_type <= 0x14 ) ||
( i_type >= 0x20 && i_type <= 0x23 ) ) ( i_type >= 0x20 && i_type <= 0x24 ) )
i_page++; i_page++;
} }
#endif #endif
...@@ -3425,12 +3425,14 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid, ...@@ -3425,12 +3425,14 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
case 0x11: /* 4:3 */ case 0x11: /* 4:3 */
case 0x12: /* 16:9 */ case 0x12: /* 16:9 */
case 0x13: /* 2.21:1 */ case 0x13: /* 2.21:1 */
case 0x14: /* HD monitor */
p_es->fmt.psz_description = strdup( _("DVB subtitles") ); p_es->fmt.psz_description = strdup( _("DVB subtitles") );
break; break;
case 0x20: /* Hearing impaired unspec. */ case 0x20: /* Hearing impaired unspec. */
case 0x21: /* h.i. 4:3 */ case 0x21: /* h.i. 4:3 */
case 0x22: /* h.i. 16:9 */ case 0x22: /* h.i. 16:9 */
case 0x23: /* h.i. 2.21:1 */ case 0x23: /* h.i. 2.21:1 */
case 0x24: /* h.i. HD monitor */
p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") ); p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") );
break; break;
default: default:
......
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