input: Remove input_DestroyThread() as it is now handled via vlc_object_release().

[vlc] / modules / demux / vobsub.c

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index c8faad910cb91b43d6017864f9e7448047c9f26b..b285c81d7806c372ce34e8af1d6301a31bf94120 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -25,14 +25,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+
 #include <errno.h>
 #include <sys/types.h>
 
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include "vlc_video.h"
-#include "charset.h"
+#include <vlc_demux.h>
+#include <vlc_charset.h>
 
 #include "ps.h"
 
@@ -80,7 +83,7 @@ typedef struct
     es_format_t fmt;
     es_out_id_t *p_es;
     int         i_track_id;
-    
+
     int         i_current_subtitle;
     int         i_subtitles;
     subtitle_t  *p_subtitles;
@@ -95,11 +98,11 @@ struct demux_sys_t
 
     text_t      txt;
     stream_t    *p_vobsub_stream;
-    
+
     /* all tracks */
     int            i_tracks;
     vobsub_track_t *track;
-    
+
     int         i_original_frame_width;
     int         i_original_frame_height;
     vlc_bool_t  b_palette;
@@ -178,9 +181,9 @@ static int Open ( vlc_object_t *p_this )
         }
     }
 
-    psz_vobname = strdup( p_demux->psz_path );
+    asprintf( &psz_vobname, "%s://%s", p_demux->psz_access, p_demux->psz_path );
     i_len = strlen( psz_vobname );
-    memcpy( psz_vobname + i_len - 4, ".sub", 4 );
+    if( i_len >= 4 ) memcpy( psz_vobname + i_len - 4, ".sub", 4 );
 
     /* open file */
     p_sys->p_vobsub_stream = stream_UrlNew( p_demux, psz_vobname );
@@ -208,11 +211,10 @@ static void Close( vlc_object_t *p_this )
 
     /* Clean all subs from all tracks */
     for( i = 0; i < p_sys->i_tracks; i++ )
-    {
-        if( p_sys->track[i].p_subtitles ) free( p_sys->track[i].p_subtitles );
-    }
-    if( p_sys->track ) free( p_sys->track );
-    
+        free( p_sys->track[i].p_subtitles );
+
+    free( p_sys->track );
+
     if( p_sys->p_vobsub_stream )
         stream_Delete( p_sys->p_vobsub_stream );
 
@@ -432,7 +434,7 @@ static int TextLoad( text_t *txt, stream_t *s )
 
     if( txt->i_line_count <= 0 )
     {
-        if( txt->line ) free( txt->line );
+        free( txt->line );
         return VLC_EGENERIC;
     }
 
@@ -443,10 +445,9 @@ static void TextUnload( text_t *txt )
     int i;
 
     for( i = 0; i < txt->i_line_count; i++ )
-    {
-        if( txt->line[i] ) free( txt->line[i] );
-    }
-    if( txt->line ) free( txt->line );
+        free( txt->line[i] );
+
+    free( txt->line );
     txt->i_line       = 0;
     txt->i_line_count = 0;
 }
@@ -472,8 +473,8 @@ static int ParseVobSubIDX( demux_t *p_demux )
         {
             return( VLC_EGENERIC );
         }
-        
-        if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' ) 
+
+        if( *line == 0 || *line == '\r' || *line == '\n' || *line == '#' )
             continue;
         else if( !strncmp( "size:", line, 5 ) )
         {
@@ -494,9 +495,9 @@ static int ParseVobSubIDX( demux_t *p_demux )
 
             /* Store the palette of the subs */
             if( sscanf( line, "palette: %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x, %x",
-                        &p_sys->palette[0], &p_sys->palette[1], &p_sys->palette[2], &p_sys->palette[3], 
-                        &p_sys->palette[4], &p_sys->palette[5], &p_sys->palette[6], &p_sys->palette[7], 
-                        &p_sys->palette[8], &p_sys->palette[9], &p_sys->palette[10], &p_sys->palette[11], 
+                        &p_sys->palette[0], &p_sys->palette[1], &p_sys->palette[2], &p_sys->palette[3],
+                        &p_sys->palette[4], &p_sys->palette[5], &p_sys->palette[6], &p_sys->palette[7],
+                        &p_sys->palette[8], &p_sys->palette[9], &p_sys->palette[10], &p_sys->palette[11],
                         &p_sys->palette[12], &p_sys->palette[13], &p_sys->palette[14], &p_sys->palette[15] ) == 16 )
             {
                 for( i = 0; i < 16; i++ )
@@ -546,7 +547,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
                 current_tk->p_subtitles = (subtitle_t*)malloc( sizeof( subtitle_t ) );;
                 current_tk->i_track_id = i_track_id;
                 current_tk->i_delay = (int64_t)0;
-                
+
                 es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
                 fmt.subs.spu.i_original_frame_width = p_sys->i_original_frame_width;
                 fmt.subs.spu.i_original_frame_height = p_sys->i_original_frame_height;
@@ -574,7 +575,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
             int h, m, s, ms, count, loc = 0;
             int i_sign = 1;
             int64_t i_start, i_location = 0;
-            
+
             vobsub_track_t *current_tk = &p_sys->track[p_sys->i_tracks - 1];
 
             if( sscanf( line, "timestamp: %d%n:%d:%d:%d, filepos: %x",
@@ -592,11 +593,11 @@ static int ParseVobSubIDX( demux_t *p_demux )
                             s * 1000 +
                             ms ) * 1000;
                 i_location = loc;
-                
+
                 current_tk->i_subtitles++;
                 current_tk->p_subtitles = (subtitle_t*)realloc( current_tk->p_subtitles, sizeof( subtitle_t ) * (current_tk->i_subtitles + 1 ) );
                 current_sub = &current_tk->p_subtitles[current_tk->i_subtitles - 1];
-                
+
                 current_sub->i_start = (int64_t) i_start * i_sign;
                 current_sub->i_start += current_tk->i_delay;
                 current_sub->i_vobsub_location = i_location;
@@ -627,7 +628,9 @@ static int ParseVobSubIDX( demux_t *p_demux )
                             ms ) * 1000;
 
                 current_tk->i_delay = current_tk->i_delay + (i_gap * i_sign);
-                msg_Dbg( p_demux, "sign: %+d gap: %+lld global delay: %+lld", i_sign, i_gap, current_tk->i_delay  );
+                msg_Dbg( p_demux, "sign: %+d gap: %+lld global delay: %+lld",
+                         i_sign, (long long)i_gap,
+                         (long long)current_tk->i_delay  );
             }
         }
     }
@@ -685,7 +688,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk )
 #define tk p_sys->track[i]
             p_pkt->i_dts = p_pkt->i_pts = p_bk->i_pts;
             p_pkt->i_length = 0;
-            
+
             if( tk.p_es && tk.i_track_id == i_spu )
             {
                 es_out_Send( p_demux->out, tk.p_es, p_pkt );