[vlc-devel] commit: Extended PSI DVB subtitle types to include 0x14/0x28 ( indicates DDS present in HD spec) (Simon Hailes )

[git version control]

vlc | branch: master | Simon Hailes <simon at screen.subtitling.com> | Wed Sep  9 15:30:40 2009 +0200| [ba1cc7ac61b3ebb55a82dda13a4ef8defa3e4d41] | committer: Jean-Baptiste Kempf 

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

Patch corrected by <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba1cc7ac61b3ebb55a82dda13a4ef8defa3e4d41
---

 modules/demux/ts.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 5d4f945..855ff22 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -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++ )
     {
         const int i_type = p_sub->p_subtitle[i].i_subtitling_type;
-        if( ( i_type >= 0x10 && i_type <= 0x13 ) ||
-            ( i_type >= 0x20 && i_type <= 0x23 ) )
+        if( ( i_type >= 0x10 && i_type <= 0x14 ) ||
+            ( i_type >= 0x20 && i_type <= 0x24 ) )
             i_page++;
     }
 #endif
@@ -3425,12 +3425,14 @@ static void PMTSetupEsDvbSubtitle( demux_t *p_demux, ts_pid_t *pid,
             case 0x11: /* 4:3 */
             case 0x12: /* 16:9 */
             case 0x13: /* 2.21:1 */
+            case 0x14: /* HD monitor */
                 p_es->fmt.psz_description = strdup( _("DVB subtitles") );
                 break;
             case 0x20: /* Hearing impaired unspec. */
             case 0x21: /* h.i. 4:3 */
             case 0x22: /* h.i. 16:9 */
             case 0x23: /* h.i. 2.21:1 */
+            case 0x24: /* h.i. HD monitor */
                 p_es->fmt.psz_description = strdup( _("DVB subtitles: hearing impaired") );
                 break;
             default: