A bit of headers cleanup

[vlc] / modules / demux / ps.h

diff --git a/modules/demux/ps.h b/modules/demux/ps.h
index 00835aeea5861d4688a36a39b84bae1c7bc55e79..6073c8b0873f78e79930da8b466eaf5d3e50d4b5 100644 (file)
--- a/modules/demux/ps.h
+++ b/modules/demux/ps.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ps.h: Program Stream demuxer helper
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,15 +18,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <vlc_demux.h>
+
 #define PS_TK_COUNT (512 - 0xc0)
 #define PS_ID_TO_TK( id ) ((id) <= 0xff ? (id) - 0xc0 : \
                                           ((id)&0xff) + (256 - 0xc0))
 
 typedef struct ps_psm_t ps_psm_t;
 static inline int ps_id_to_type( ps_psm_t *, int );
+static inline uint8_t *ps_id_to_lang( ps_psm_t *, int );
 
 typedef struct
 {
@@ -35,6 +38,8 @@ typedef struct
     int         i_id;
     es_out_id_t *es;
     es_format_t fmt;
+    mtime_t     i_first_pts;
+    mtime_t     i_last_pts;
 
 } ps_track_t;
 
@@ -48,6 +53,8 @@ static inline void ps_track_init( ps_track_t tk[PS_TK_COUNT] )
         tk[i].i_skip = 0;
         tk[i].i_id   = 0;
         tk[i].es     = NULL;
+        tk[i].i_first_pts = -1;
+        tk[i].i_last_pts = -1;
         es_format_Init( &tk[i].fmt, UNKNOWN_ES, 0 );
     }
 }
@@ -99,7 +106,11 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
 
         es_format_Init( &tk->fmt, UNKNOWN_ES, 0 );
 
-        if( (i_id&0xf0) == 0xe0 && i_type == 0x10 )
+        if( (i_id&0xf0) == 0xe0 && i_type == 0x1b )
+        {
+            es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('h','2','6','4') );
+        }
+        else if( (i_id&0xf0) == 0xe0 && i_type == 0x10 )
         {
             es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('m','p','4','v') );
         }
@@ -107,6 +118,10 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id )
         {
             es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('m','p','g','v') );
         }
+        else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x0f )
+        {
+            es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','p','4','a') );
+        }
         else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x03 )
         {
             es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','p','g','a') );
@@ -126,6 +141,13 @@ 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;
 
+    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;
+    }
+
     return VLC_SUCCESS;
 }
 
@@ -343,7 +365,7 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra )
 }
 
 /* Program stream map handling */
-typedef struct p_es_t
+typedef struct ps_es_t
 {
     int i_type;
     int i_id;
@@ -351,6 +373,9 @@ typedef struct p_es_t
     int i_descriptor;
     uint8_t *p_descriptor;
 
+    /* Language is iso639-2T */
+    uint8_t lang[3];
+
 } ps_es_t;
 
 struct ps_psm_t
@@ -371,6 +396,16 @@ static inline int ps_id_to_type( ps_psm_t *p_psm, int i_id )
     return 0;
 }
 
+static inline uint8_t *ps_id_to_lang( ps_psm_t *p_psm, int i_id )
+{
+    int i;
+    for( i = 0; p_psm && i < p_psm->i_es; i++ )
+    {
+        if( p_psm->es[i]->i_id == i_id ) return p_psm->es[i]->lang;     
+    }
+    return 0;
+}
+
 static inline void ps_psm_init( ps_psm_t *p_psm )
 {
     p_psm->i_version = 0xFFFF;
@@ -401,7 +436,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
 
     if( !p_psm || p_buffer[3] != 0xbc ) return VLC_EGENERIC;
 
-    i_length = (uint16_t)(p_buffer[4] << 8) + p_buffer[5];
+    i_length = (uint16_t)(p_buffer[4] << 8) + p_buffer[5] + 6;
     if( i_length > i_buffer ) return VLC_EGENERIC;
 
     //i_current_next_indicator = (p_buffer[6] && 0x01);
@@ -422,6 +457,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 es;
+        es.lang[0] = es.lang[1] = es.lang[2] = 0;
 
         es.i_type = p_buffer[ i_es_base  ];
         es.i_id = p_buffer[ i_es_base + 1 ];
@@ -434,8 +470,28 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
         es.i_descriptor = i_info_length;
         if( i_info_length > 0 )
         {
+            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 )
+            {
+                /* 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;
+            }
         }
 
         p_psm->es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) );