Changeset 55320a77c20c9855c67c9f07598daee5804e57d6

Timestamp:

11/13/03 14:31:12 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1068730272 +0000

git-parent:

[3f71e7714a4380254cda040ad67e1fb7c5d7bae4]

git-author:

Laurent Aimar <fenrir@videolan.org> 1068730272 +0000

Message:

• input: handle also SPU in es_out_Add (and fix a bad lock).
  
• sub: use es_out_Add (and that give a proper solution for multiple tracks)
  

fixed seeking with sub. (pf_demux was called in Seek instead of
pf_seek ...)

Files:

• modules/demux/util/sub.c (modified) (10 diffs)
• modules/demux/util/sub.h (modified) (9 diffs)
• src/input/input.c (modified) (6 diffs)

modules/demux/util/sub.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
-5 2003/11/05 00:39:16 gbazin
+6 2003/11/13 13:31:12 fenrir
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -238 +238 @@
-    while (*p_pos)
-    {
-   
-
-   
-   
-   
-
-       
-       
-   
-   
-   
-   
+        
+
+        
+        
+        
+
+                
+                
+        
+        
+        
+        
-    }
-    return NULL;
@@ -265 +265 @@
-    text_t  txt;
-    vlc_value_t val;
+    es_format_t  fmt;
-
-    int     i;
@@ -470 +471 @@
-
-    /* *** add subtitle ES *** */
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_sub->p_es = input_AddES( p_input, p_input->stream.p_selected_program,
-                               0xff - i_track_id,    /* FIXME */
-                               SPU_ES, NULL, 0 );
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-
-    p_sub->p_es->i_stream_id = 0xff - i_track_id;    /* FIXME */
-    
-    if( p_sub->psz_header != NULL )
-    {
-        p_sub->p_es->p_demux_data = malloc( sizeof( subtitle_data_t ) );
-        p_sub->p_es->p_demux_data->psz_header = strdup( p_sub->psz_header );
-        free( p_sub->psz_header );
-    }
-
-    if( p_sub->i_sub_type == SUB_TYPE_VOBSUB )
-    {
-
-
+
-    }
-    else if( p_sub->i_sub_type == SUB_TYPE_SSA1 ||
-             p_sub->i_sub_type == SUB_TYPE_SSA2_4 )
-    {
-p_sub->p_es->i_fourcc    = VLC_FOURCC( 's','s','a',' '
+es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','s','a',' ' )
-    }
-    else
-    {
-
-
+
+
+
+
+
+
+
+
+
-
-    p_sub->i_previously_selected = 0;
@@ -509 +501 @@
-static int  sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate )
-{
-
+
+
+
+
+
-    {
-        p_sub->i_previously_selected = 1;
@@ -515 +511 @@
-        return VLC_SUCCESS;
-    }
-p_sub->p_es->p_decoder_fifo
+b
-    {
-        p_sub->i_previously_selected = 0;
@@ -573 +569 @@
-        p_pes->i_nb_data = 1;
-        p_pes->p_first =
-    
+
-        p_pes->i_pes_size = i_len;
-
@@ -579 +575 @@
-                p_sub->subtitle[p_sub->i_subtitle].psz_text,
-                i_len );
-
-{
-
-input_DecodePES( p_sub->p_es->p_decoder_fifo
+
+if( p_pes->i_pts > 0 )
+
+es_out_Send( p_input->p_es_out, p_sub->p_es
-        }
-        else
@@ -591 +587 @@
-        p_sub->i_subtitle++;
-    }
-( 0 )
+ VLC_SUCCESS
-}
-
@@ -606 +602 @@
-        p_sub->i_subtitle++;
-    }
-
-    return( 0 );
-}

modules/demux/util/sub.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-0 2003/11/05 00:17:50 hartman
+1 2003/11/13 13:31:12 fenrir
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- 
+
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41 +41 @@
-} subtitle_t;
-
-
+
+
-{
-    int             i_track_id;
@@ -52 +53 @@
-    int             i_previously_selected; /* to make pf_seek */
-    es_descriptor_t *p_es;
-
+
-} subtitle_track_t;
+#endif
-
-typedef struct subtitle_demux_s
-{
-    VLC_COMMON_MEMBERS
-
+
-    module_t        *p_module;
-
- 
- 
+
+
+
-                         char *psz_name,
-                         mtime_t i_microsecperframe,
@@ -69 +71 @@
-    int     (*pf_seek) ( struct subtitle_demux_s *p_sub, mtime_t i_date );
-    void    (*pf_close)( struct subtitle_demux_s *p_sub );
-    
-
-    /* *** private *** */
@@ -79 +80 @@
-    int                 i_subtitles;
-    subtitle_t          *subtitle;
-descriptor_t
+out_id_t    
-    int                 i_previously_selected; /* to make pf_seek */
-
- 
-   
+ 
+ 
-    */
-    
-
-} subtitle_demux_t;
-
-/*****************************************************************************
-
-
-
-
-
-
-
-
-
-
+
- *               selected by default.
- *****************************************************************************
@@ -113 +104 @@
-                                              char *psz_name,
-                                              mtime_t i_microsecperframe,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-{
-    subtitle_demux_t *p_sub;
@@ -186 +138 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-static inline int subtitle_Demux( subtitle_demux_t *p_sub, mtime_t i_max )
-{
@@ -212 +146 @@
-}
-
+/*****************************************************************************
+ * subtitle_Seek: Seek to i_date
+ *****************************************************************************/
-static inline int subtitle_Seek( subtitle_demux_t *p_sub, mtime_t i_date )
-{
-demux
+seek
-}
-
+/*****************************************************************************
+ * subtitle_Close: Stop ES decoder and free all memory included p_sub.
+ *****************************************************************************/
-static inline void subtitle_Close( subtitle_demux_t *p_sub )
-{
@@ -230 +170 @@
-    }
-}
+

src/input/input.c

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-3 2003/11/13 12:28:34
+4 2003/11/13 13:31:12
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -746 +746 @@
-        if( ( p_sub = subtitle_New( p_input, strdup(val.psz_string), i_microsecondperframe, 0 ) ) )
-        {
+            /* Select this ES by default */
+            es_out_Control( p_input->p_es_out, ES_OUT_SET_SELECT, p_sub->p_es, VLC_TRUE );
+
-            TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
-            subtitle_Select( p_sub );
-        }
-    }
-    if( val.psz_string ) free( val.psz_string );
-
+
-    var_Get( p_input, "sub-autodetect-file", &val );
-    if( val.b_bool )
@@ -1110 +1112 @@
-            }
-            id->p_es->p_bitmapinfoheader = p_bih;
+            break;
+        }
+        case SPU_ES:
+        {
+            subtitle_data_t *p_sub = malloc( sizeof( subtitle_data_t ) );
+            memset( p_sub, 0, sizeof( subtitle_data_t ) );
+            if( fmt->i_extra > 0 )
+            {
+                if( fmt->i_extra_type == ES_EXTRA_TYPE_SUBHEADER )
+                {
+                    p_sub->psz_header = malloc( fmt->i_extra  );
+                    memcpy( p_sub->psz_header, fmt->p_extra , fmt->i_extra );
+                }
+            }
+            /* FIXME beuuuuuurk */
+            id->p_es->p_demux_data = p_sub;
-            break;
-        }
@@ -1239 +1257 @@
-    {
-        case ES_OUT_SET_SELECT:
+            vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
-            id = (es_out_id_t*) va_arg( args, es_out_id_t * );
-            b = (vlc_bool_t) va_arg( args, vlc_bool_t );
@@ -1244 +1263 @@
-            {
-                input_SelectES( p_sys->p_input, id->p_es );
+                vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-                return id->p_es->p_decoder_fifo ? VLC_SUCCESS : VLC_EGENERIC;
-            }
@@ -1249 +1269 @@
-            {
-                input_UnselectES( p_sys->p_input, id->p_es );
-}
-
-
+    vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
+    
+
-        case ES_OUT_GET_SELECT:
-            id = (es_out_id_t*) va_arg( args, es_out_id_t * );