#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
+#include <vlc_memory.h>
-#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
#include <ctype.h>
#include <vlc_demux.h>
if( p_sys->i_subtitles >= i_max )
{
i_max += 500;
- if( !( p_sys->subtitle = realloc( p_sys->subtitle,
+ if( !( p_sys->subtitle = realloc_or_free( p_sys->subtitle,
sizeof(subtitle_t) * i_max ) ) )
{
- free( p_sys->subtitle );
TextUnload( &p_sys->txt );
free( p_sys );
return VLC_ENOMEM;
}
p_block->i_dts =
- p_block->i_pts = 1 + p_subtitle->i_start;
- if( p_subtitle->i_stop > 0 && p_subtitle->i_stop >= p_subtitle->i_start )
+ p_block->i_pts = VLC_TS_0 + p_subtitle->i_start;
+ if( p_subtitle->i_stop >= 0 && p_subtitle->i_stop >= p_subtitle->i_start )
p_block->i_length = p_subtitle->i_stop - p_subtitle->i_start;
memcpy( p_block->p_buffer, p_subtitle->psz_text, i_len );
txt->i_line_count = 0;
txt->i_line = 0;
txt->line = calloc( i_line_max, sizeof( char * ) );
+ if( !txt->line )
+ return VLC_ENOMEM;
/* load the complete file */
for( ;; )
if( txt->i_line_count >= i_line_max )
{
i_line_max += 100;
- txt->line = realloc( txt->line, i_line_max * sizeof( char * ) );
+ txt->line = realloc_or_free( txt->line, i_line_max * sizeof( char * ) );
+ if( !txt->line )
+ return VLC_ENOMEM;
}
}
return VLC_ENOMEM;
i_start = 0;
- i_stop = 0;
+ i_stop = -1;
if( sscanf( s, "{%d}{}%[^\r\n]", &i_start, psz_text ) == 2 ||
sscanf( s, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, psz_text ) == 3)
{
/* */
p_subtitle->i_start = i_start * p_sys->i_microsecperframe;
- p_subtitle->i_stop = i_stop * p_sys->i_microsecperframe;
+ p_subtitle->i_stop = i_stop >= 0 ? (i_stop * p_sys->i_microsecperframe) : -1;
p_subtitle->psz_text = psz_text;
return VLC_SUCCESS;
}
}
i_old = strlen( psz_text );
- psz_text = realloc( psz_text, i_old + i_len + 1 + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
if( !psz_text )
{
return VLC_ENOMEM;
free( psz_text );
/* All the other stuff we add to the header field */
- if( !p_sys->psz_header )
- p_sys->psz_header = strdup( "" );
- if( !p_sys->psz_header )
+ char *psz_header;
+ if( asprintf( &psz_header, "%s%s\n",
+ p_sys->psz_header ? p_sys->psz_header : "", s ) == -1 )
return VLC_ENOMEM;
-
- p_sys->psz_header =
- realloc( p_sys->psz_header,
- strlen( p_sys->psz_header ) + strlen( s ) + 2 );
- strcat( p_sys->psz_header, s );
- strcat( p_sys->psz_header, "\n" );
+ p_sys->psz_header = psz_header;
}
}
p_subtitle->i_start = ( (int64_t)h1 * 3600*1000 +
(int64_t)m1 * 60*1000 +
(int64_t)s1 * 1000 ) * 1000;
- p_subtitle->i_stop = 0;
+ p_subtitle->i_stop = -1;
break;
}
free( psz_text );
}
p_subtitle->i_start = i_start * 1000;
- p_subtitle->i_stop = 0;
+ p_subtitle->i_stop = -1;
p_subtitle->psz_text = strdup( text );
return VLC_SUCCESS;
(int64_t)m1 * 60*1000 +
(int64_t)s1 * 1000 +
(int64_t)c1 * 10) * 1000;
- p_subtitle->i_stop = 0;
+ p_subtitle->i_stop = -1;
break;
}
}
}
i_old = strlen( psz_text );
- psz_text = realloc( psz_text, i_old + i_len + 1 + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
if( !psz_text )
return VLC_ENOMEM;
strcat( psz_text, s );
return VLC_ENOMEM;
i_start = 0;
- i_stop = 0;
+ i_stop = -1;
if( sscanf( s, "[%d][] %[^\r\n]", &i_start, psz_text ) == 2 ||
sscanf( s, "[%d][%d] %[^\r\n]", &i_start, &i_stop, psz_text ) == 3)
{
p_subtitle->i_start = (int64_t)i_start * 100000;
- p_subtitle->i_stop = (int64_t)i_stop * 100000;
+ p_subtitle->i_stop = i_stop >= 0 ? ((int64_t)i_stop * 100000) : -1;
break;
}
free( psz_text );
if( sscanf (s, "-->> %d", &t) == 1)
{
p_subtitle->i_start = (int64_t)t; /* * FPS*/
- p_subtitle->i_stop = 0;
+ p_subtitle->i_stop = -1;
/* Starting of a subtitle */
if( i_firstline )
else
{
i_old = strlen( psz_text ) + 1;
- psz_text = realloc( psz_text, i_old + strlen( s ) + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + strlen( s ) + 1 );
if( !psz_text )
return VLC_ENOMEM;
strcat( psz_text, s );
int i_old = strlen( psz_text );
- psz_text = realloc( psz_text, i_old + i_len + 1 + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
if( !psz_text )
return VLC_ENOMEM;
int i_old = strlen( psz_text );
- psz_text = realloc( psz_text, i_old + i_len + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + i_len + 1 );
if( !psz_text )
return VLC_ENOMEM;
/* Get the times */
int64_t i_time = ParseRealTime( psz_begin, &h1, &m1, &s1, &f1 );
- if( i_time >= 0)
- {
- p_subtitle->i_start = i_time;
- }
+ p_subtitle->i_start = i_time >= 0 ? i_time : 0;
i_time = ParseRealTime( psz_end, &h2, &m2, &s2, &f2 );
- if( i_time >= 0 )
- {
- p_subtitle->i_stop = i_time;
- }
+ p_subtitle->i_stop = i_time >= 0 ? i_time : -1;
break;
}
}
int i_old = strlen( psz_text );
- psz_text = realloc( psz_text, i_old + i_len + 1 + 1 );
+ psz_text = realloc_or_free( psz_text, i_old + i_len + 1 + 1 );
if( !psz_text )
return VLC_ENOMEM;
p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 +
(int64_t)m2 * 60*1000 +
(int64_t)s2 * 1000 ) * 1000;
+ else
+ p_subtitle->i_stop = -1;
break;
}
free( psz_text );
p_subtitle->i_stop = ( (int64_t)h2 * 3600*1000 +
(int64_t)m2 * 60*1000 +
(int64_t)s2 * 1000 ) * 1000;
+ else
+ p_subtitle->i_stop = -1;
+
break;
}
}