Sync PO files

[vlc] / modules / demux / ps.h

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index 0b2fd4beca297234c15f4e88be28d7c9240345bb..191cce3fa242b24907095bc47f22c54fb7bd4471 100644 (file)
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -34,7 +34,7 @@ static inline const uint8_t *ps_id_to_lang( const ps_psm_t *, int );
 
 typedef struct
 {
-    vlc_bool_t  b_seen;
+    bool  b_seen;
     int         i_skip;
     int         i_id;
     es_out_id_t *es;
@@ -50,7 +50,7 @@ static inline void ps_track_init( ps_track_t tk[PS_TK_COUNT] )
     int i;
     for( i = 0; i < PS_TK_COUNT; i++ )
     {
-        tk[i].b_seen = VLC_FALSE;
+        tk[i].b_seen = false;
         tk[i].i_skip = 0;
         tk[i].i_id   = 0;
         tk[i].es     = NULL;
@@ -101,6 +101,10 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
         {
             es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('c','v','d',' ') );
         }
+        else if( ( i_id&0xff ) == 0x10 )
+        {
+            es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('t','e','l','x') );
+        }
         else
         {
             es_format_Init( &tk->fmt, UNKNOWN_ES, 0 );
@@ -159,13 +163,16 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
     }
 
     /* PES packets usually contain truncated frames */
-    tk->fmt.b_packetized = VLC_FALSE;
+    tk->fmt.b_packetized = false;
 
-    if( ps_id_to_lang( p_psm , i_id ) )
+    if( ps_id_to_lang( p_psm, i_id ) )
     {
         tk->fmt.psz_language = malloc( 4 );
-        memcpy( tk->fmt.psz_language, ps_id_to_lang( p_psm , i_id ), 3 );
-        tk->fmt.psz_language[3] = 0;
+        if( tk->fmt.psz_language )
+        {
+            memcpy( tk->fmt.psz_language, ps_id_to_lang( p_psm , i_id ), 3 );
+            tk->fmt.psz_language[3] = 0;
+        }
     }
 
     return VLC_SUCCESS;
@@ -188,8 +195,7 @@ static inline int ps_pkt_id( block_t *p_pkt )
     {
         /* ISO 13818 amendment 2 and SMPTE RP 227 */
         const uint8_t i_flags = p_pkt->p_buffer[7];
-        int i_skip = 9;
-
+        unsigned int i_skip = 9;
 
         /* Find PES extension */
         if( (i_flags & 0x80 ) )
@@ -242,7 +248,7 @@ static inline int ps_pkt_id( block_t *p_pkt )
 /* return the size of the next packet
  * XXX you need to give him at least 14 bytes (and it need to start as a
  * valid packet) */
-static inline int ps_pkt_size( uint8_t *p, int i_peek )
+static inline int ps_pkt_size( const uint8_t *p, int i_peek )
 {
     if( p[3] == 0xb9 && i_peek >= 4 )
     {
@@ -325,7 +331,7 @@ static inline int ps_pkt_parse_system( block_t *p_pkt, ps_psm_t *p_psm,
             {
                 if( !ps_track_fill( &tk[i_tk], p_psm, i_id ) )
                 {
-                    tk[i_tk].b_seen = VLC_TRUE;
+                    tk[i_tk].b_seen = true;
                 }
             }
         }
@@ -337,7 +343,7 @@ static inline int ps_pkt_parse_system( block_t *p_pkt, ps_psm_t *p_psm,
 static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra )
 {
     uint8_t header[30];
-    int     i_skip  = 0;
+    unsigned int i_skip  = 0;
 
     memcpy( header, p_pes->p_buffer, __MIN( p_pes->i_buffer, 30 ) );
 
@@ -493,11 +499,10 @@ static inline void ps_psm_destroy( ps_psm_t *p_psm )
 {
     while( p_psm->i_es-- )
     {
-        if( p_psm->es[p_psm->i_es]->i_descriptor )
-            free( p_psm->es[p_psm->i_es]->p_descriptor );
+        free( p_psm->es[p_psm->i_es]->p_descriptor );
         free( p_psm->es[p_psm->i_es] );
     }
-    if( p_psm->es ) free( p_psm->es );
+    free( p_psm->es );
 
     p_psm->es = 0;
     p_psm->i_es = 0;
@@ -532,6 +537,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
 
     while( i_es_base + 4 < i_length )
     {
+        ps_es_t **tmp_es;
         ps_es_t es;
         es.lang[0] = es.lang[1] = es.lang[2] = 0;
 
@@ -554,31 +560,41 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
             int i = 0;
 
             es.p_descriptor = malloc( i_info_length );
-            memcpy( es.p_descriptor, p_buffer + i_es_base + 4, i_info_length);
-
-            while( i <= es.i_descriptor - 2 )
+            if( es.p_descriptor )
             {
-                /* Look for the ISO639 language descriptor */
-                if( es.p_descriptor[i] != 0x0a )
-                {
-                    i += es.p_descriptor[i+1] + 2;
-                    continue;
-                }
+                memcpy( es.p_descriptor, p_buffer + i_es_base + 4, i_info_length);
 
-                if( i <= es.i_descriptor - 6 )
+                while( i <= es.i_descriptor - 2 )
                 {
-                    es.lang[0] = es.p_descriptor[i+2];
-                    es.lang[1] = es.p_descriptor[i+3];
-                    es.lang[2] = es.p_descriptor[i+4];
+                    /* Look for the ISO639 language descriptor */
+                    if( es.p_descriptor[i] != 0x0a )
+                    {
+                        i += es.p_descriptor[i+1] + 2;
+                        continue;
+                    }
+
+                    if( i <= es.i_descriptor - 6 )
+                    {
+                        es.lang[0] = es.p_descriptor[i+2];
+                        es.lang[1] = es.p_descriptor[i+3];
+                        es.lang[2] = es.p_descriptor[i+4];
+                    }
+                    break;
                 }
-                break;
             }
         }
 
-        p_psm->es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) );
-        p_psm->es[p_psm->i_es] = malloc( sizeof(ps_es_t) );
-        *p_psm->es[p_psm->i_es++] = es;
-        i_es_base += 4 + i_info_length;
+        tmp_es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) );
+        if( tmp_es )
+        {
+            p_psm->es = tmp_es;
+            p_psm->es[p_psm->i_es] = malloc( sizeof(ps_es_t) );
+            if( p_psm->es[p_psm->i_es] )
+            {
+                *p_psm->es[p_psm->i_es++] = es;
+                i_es_base += 4 + i_info_length;
+            }
+        }
     }
 
     /* TODO: CRC */
@@ -599,7 +615,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
 
         es_out_Del( out, tk[i].es );
         tk[i] = tk_tmp;
-        tk[i].b_seen = VLC_TRUE;
+        tk[i].b_seen = true;
         tk[i].es = es_out_Add( out, &tk[i].fmt );
     }