* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
#include <ctype.h>
#include <vlc_access.h> /* DVB-specific things */
# endif
#endif
#ifdef HAVE_TIME_H
-# include <time.h>
+# include <time.h>
#endif
#undef TS_DEBUG
add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE );
add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE );
add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE );
- add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,
+ add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
MTUOUT_LONGTEXT, VLC_TRUE );
add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE );
add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE );
add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE );
+ change_unsafe();
add_bool( "ts-dump-append", 0, NULL, APPEND_TEXT, APPEND_LONGTEXT, VLC_FALSE );
add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT,
DUMPSIZE_LONGTEXT, VLC_TRUE );
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_sync, i_peek, i;
int i_packet_size;
if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
- if( p_peek[0] == 'T' && p_peek[1] == 'F' &&
- p_peek[2] == 'r' && p_peek[3] == 'c' )
+ if( memcmp( p_peek, "TFrc", 4 ) == 0 )
{
b_topfield = VLC_TRUE;
msg_Dbg( p_demux, "this is a topfield file" );
}
if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield )
{
- if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC;
+ if( !p_demux->b_force )
+ return VLC_EGENERIC;
msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
}
/* Check next 3 sync bytes */
i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
}
-
+
if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek )
{
msg_Err( p_demux, "cannot peek" );
{
i_packet_size = TS_PACKET_SIZE_204;
}
- else if( !strcmp( p_demux->psz_demux, "ts" ) )
+ else if( p_demux->b_force )
{
i_packet_size = TS_PACKET_SIZE_188;
}
{
i_packet_size = TS_PACKET_SIZE_188;
#if 0
- /* I used the TF5000PVR 2004 Firmware .doc header documentation,
+ /* I used the TF5000PVR 2004 Firmware .doc header documentation,
* http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
* but after the filename the offsets seem to be incorrect. - DJ */
int i_duration, i_name;
// 4 bytes of freq. Uimsbf (56,57,58,59)
// 2 bytes of symbol rate Uimsbf (60,61)
// 2 bytes of TS stream ID Uimsbf (62,63)
- // 4 bytes reserved
+ // 4 bytes reserved
// 2 bytes reserved
// 2 bytes duration Uimsbf (70,71)
//i_duration = (int) (p_peek[70] << 8) | p_peek[71];
}
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
memset( p_sys, 0, sizeof( demux_sys_t ) );
p_sys->i_packet_size = i_packet_size;
p_sys->b_meta = VLC_TRUE;
p_sys->b_dvb_control = VLC_TRUE;
p_sys->i_dvb_program = 0;
- p_sys->i_dvb_start = 0;;
+ p_sys->i_dvb_start = 0;
p_sys->i_dvb_length = 0;
for( i = 0; i < 8192; i++ )
p_sys->buffer = malloc( p_sys->i_packet_size * p_sys->i_ts_read );
}
}
- if( val.psz_string )
- {
- free( val.psz_string );
- }
+ free( val.psz_string );
/* We handle description of an extra PMT */
var_Create( p_demux, "ts-extra-pmt", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
/* Dummy PMT */
prg = malloc( sizeof( ts_prg_psi_t ) );
+ if( !prg )
+ {
+ msg_Err( p_demux, "out of memory" );
+ Close( VLC_OBJECT(p_demux) );
+ return VLC_ENOMEM;
+ }
+
memset( prg, 0, sizeof( ts_prg_psi_t ) );
prg->i_pid_pcr = -1;
prg->i_pid_pmt = -1;
}
}
}
- if( val.psz_string )
- {
- free( val.psz_string );
- }
+ free( val.psz_string );
var_Create( p_demux, "ts-csa-ck", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Get( p_demux, "ts-csa-ck", &val );
}
}
}
- if( val.psz_string )
- {
- free( val.psz_string );
- }
+ free( val.psz_string );
var_Create( p_demux, "ts-silent", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Get( p_demux, "ts-silent", &val );
if( p_sys->b_dvb_control && pid->i_pid > 0 )
{
/* too much */
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, VLC_FALSE );
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid,
+ VLC_FALSE );
}
}
/* If in dump mode, then close the file */
if( p_sys->b_file_out )
{
- msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file,
- p_sys->i_write / 1024 );
+ msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)",
+ p_sys->psz_file, p_sys->i_write / 1024 );
if( p_sys->p_file != stdout )
{
while( !p_demux->b_die )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_peek, i_skip = 0;
i_peek = stream_Peek( p_demux->s, &p_peek,
if( !b_old_valid )
{
+ free( pid->psi );
pid->psi = malloc( sizeof( ts_psi_t ) );
- pid->psi->handle= NULL;
- pid->psi->i_prg = 0;
- pid->psi->prg = NULL;
+ if( pid->psi )
+ {
+ pid->psi->handle= NULL;
+ pid->psi->i_prg = 0;
+ pid->psi->prg = NULL;
+ }
}
pid->psi->i_pat_version = -1;
pid->psi->i_sdt_version = -1;
if( p_owner )
{
ts_prg_psi_t *prg = malloc( sizeof( ts_prg_psi_t ) );
- /* PMT */
- prg->i_version = -1;
- prg->i_number = -1;
- prg->i_pid_pcr = -1;
- prg->i_pid_pmt = -1;
- prg->iod = NULL;
- prg->handle = NULL;
-
- TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
+ if( prg )
+ {
+ /* PMT */
+ prg->i_version = -1;
+ prg->i_number = -1;
+ prg->i_pid_pcr = -1;
+ prg->i_pid_pmt = -1;
+ prg->iod = NULL;
+ prg->handle = NULL;
+
+ TAB_APPEND( pid->psi->i_prg, pid->psi->prg, prg );
+ }
}
}
else
{
pid->psi = NULL;
pid->es = malloc( sizeof( ts_es_t ) );
-
- es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
- pid->es->id = NULL;
- pid->es->p_pes = NULL;
- pid->es->i_pes_size= 0;
- pid->es->i_pes_gathered= 0;
- pid->es->pp_last = &pid->es->p_pes;
- pid->es->p_mpeg4desc = NULL;
- pid->es->b_gather = VLC_FALSE;
+ if( pid->es )
+ {
+ es_format_Init( &pid->es->fmt, UNKNOWN_ES, 0 );
+ pid->es->id = NULL;
+ pid->es->p_pes = NULL;
+ pid->es->i_pes_size= 0;
+ pid->es->i_pes_gathered= 0;
+ pid->es->pp_last = &pid->es->p_pes;
+ pid->es->p_mpeg4desc = NULL;
+ pid->es->b_gather = VLC_FALSE;
+ }
}
}
dvbpsi_DetachPMT( pid->psi->prg[i]->handle );
free( pid->psi->prg[i] );
}
- if( pid->psi->prg ) free( pid->psi->prg );
+ free( pid->psi->prg );
free( pid->psi );
}
else
/* */
i_skip += 2;
}
+#ifdef ZVBI_COMPILED
else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
- i_skip = 0; /* FIXME temporary hack for zvbi support */
-
+ i_skip = 0; /*hack for zvbi support */
+#endif
/* skip header */
while( p_pes && i_skip > 0 )
{
const vlc_bool_t b_adaptation = p[3]&0x20;
const vlc_bool_t b_payload = p[3]&0x10;
const int i_cc = p[3]&0x0f; /* continuity counter */
- vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */
+ vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */
/* transport_scrambling_control is ignored */
int i_skip = 0;
return( i_len );
}
+
static int IODGetByte( int *pi_data, uint8_t **pp_data )
{
if( *pi_data > 0 )
}
return( 0 );
}
+
static int IODGetWord( int *pi_data, uint8_t **pp_data )
{
const int i1 = IODGetByte( pi_data, pp_data );
const int i2 = IODGetByte( pi_data, pp_data );
return( ( i1 << 8 ) | i2 );
}
+
static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
{
const int i1 = IODGetByte( pi_data, pp_data );
i_url_len = IODGetByte( pi_data, pp_data );
url = malloc( i_url_len + 1 );
+ if( !url ) return NULL;
for( i = 0; i < i_url_len; i++ )
{
url[i] = IODGetByte( pi_data, pp_data );
int i_iod_length;
p_iod = malloc( sizeof( iod_descriptor_t ) );
+ if( !p_iod ) return NULL;
memset( p_iod, 0, sizeof( iod_descriptor_t ) );
#ifdef TS_DEBUG
}
else
{
- if( es_descr.dec_descr.p_decoder_specific_info != NULL )
- {
- free( es_descr.dec_descr.p_decoder_specific_info );
- es_descr.dec_descr.p_decoder_specific_info = NULL;
- es_descr.dec_descr.i_decoder_specific_info_len = 0;
- }
+ free( es_descr.dec_descr.p_decoder_specific_info );
+ es_descr.dec_descr.p_decoder_specific_info = NULL;
+ es_descr.dec_descr.i_decoder_specific_info_len = 0;
}
}
es_descr.b_ok = 0;
const int c = ( mp == 14 || mp == 15 ) ? 1 : 0;
*p_y = 1900 + yp + c*1;
- *p_m = mp - 1 + c*12;
+ *p_m = mp - 1 - c*12;
*p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
}
#define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf))
}
static int EITConvertDuration( uint32_t i_duration )
{
- return CVT_FROM_BCD(i_duration >> 16) * 3600 +
+ return CVT_FROM_BCD(i_duration >> 16) * 3600 +
CVT_FROM_BCD(i_duration >> 8 ) * 60 +
CVT_FROM_BCD(i_duration );
}
#undef CVT_FROM_BCD
-static inline char *FixUTF8( char *p )
-{
- EnsureUTF8( p );
- return p;
-}
/* FIXME same than dvbsi_to_utf8 from dvb access */
-static char *EITConvertToUTF8( unsigned char *psz_instring, size_t i_length )
+static char *EITConvertToUTF8( const unsigned char *psz_instring,
+ size_t i_length )
{
const char *psz_encoding;
- const unsigned char *psz_stringstart, *psz_outstring;
- char *psz_tmp;
- char psz_encbuf[12];
- size_t i_in, i_out;
+ char *psz_outstring;
+ char psz_encbuf[sizeof( "ISO_8859-123" )];
+ size_t i_in, i_out, offset = 1;
vlc_iconv_t iconv_handle;
+
if( i_length < 1 ) return NULL;
if( psz_instring[0] >= 0x20 )
{
- psz_stringstart = psz_instring;
- psz_encoding = "ISO_8859-1"; /* should be ISO6937 according to spec, but this seems to be the one used */
+ psz_encoding = "ISO_8859-1";
+ /* According to the specification, this should be ISO6937,
+ * but it seems Latin-1 is used instead. */
+ offset = 0;
}
else switch( psz_instring[0] )
{
case 0x01:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-5";
break;
case 0x02:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-6";
break;
case 0x03:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-7";
break;
case 0x04:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-8";
break;
case 0x05:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-9";
break;
case 0x06:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-10";
break;
case 0x07:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-11";
break;
case 0x08:
- psz_stringstart = &psz_instring[1]; /*possibly reserved?*/
psz_encoding = "ISO_8859-12";
break;
case 0x09:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-13";
break;
case 0x0a:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-14";
break;
case 0x0b:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-15";
break;
case 0x10:
- if( i_length < 3 || psz_instring[1] != '\0' || psz_instring[2] > 0x0f
- || psz_instring[2] == 0 )
- return FixUTF8(strndup(psz_instring,i_length));
- sprintf( psz_encbuf, "ISO_8859-%d", psz_instring[2] );
- psz_stringstart = &psz_instring[3];
- psz_encoding = psz_encbuf;
+#warning Is Latin-10 (psz_instring[2] == 16) really illegal?
+ if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
+ || psz_instring[2] == 0 )
+ {
+ psz_encoding = "UTF-8";
+ offset = 0;
+ }
+ else
+ {
+ sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
+ psz_encoding = psz_encbuf;
+ offset = 3;
+ }
break;
case 0x11:
- psz_stringstart = &psz_instring[1];
+#warning Is there a BOM or do we use a fixed endianess?
psz_encoding = "UTF-16";
break;
case 0x12:
- psz_stringstart = &psz_instring[1];
psz_encoding = "KSC5601-1987";
break;
case 0x13:
- psz_stringstart = &psz_instring[1];
- psz_encoding = "GB2312";/*GB-2312-1980 */
+ psz_encoding = "GB2312"; /* GB-2312-1980 */
break;
case 0x14:
- psz_stringstart = &psz_instring[1];
psz_encoding = "BIG-5";
break;
case 0x15:
- return FixUTF8(strndup(&psz_instring[1],i_length-1));
+ psz_encoding = "UTF-8";
break;
default:
/* invalid */
- return FixUTF8(strndup(psz_instring,i_length));
+ psz_encoding = "UTF-8";
+ offset = 0;
}
+
+ i_in = i_length - offset;
+ i_out = i_in * 6 + 1;
+
+ psz_outstring = malloc( i_out );
+ if( !psz_outstring )
+ {
+ return NULL;
+ }
+
iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding );
- i_in = i_length - (psz_stringstart - psz_instring );
- i_out = i_in * 6;
- psz_outstring = psz_tmp = (char*)malloc( i_out * sizeof(char) + 1 );
- vlc_iconv( iconv_handle, &psz_stringstart, &i_in, &psz_tmp, &i_out );
- vlc_iconv_close( iconv_handle );
- *psz_tmp = '\0';
+ if( iconv_handle == (vlc_iconv_t)(-1) )
+ {
+ /* Invalid character set (e.g. ISO_8859-12) */
+ memcpy( psz_outstring, &psz_instring[offset], i_in );
+ psz_outstring[i_in] = '\0';
+ EnsureUTF8( psz_outstring );
+ }
+ else
+ {
+ const char *psz_in = (const char *)&psz_instring[offset];
+ char *psz_out = psz_outstring;
+
+ while( vlc_iconv( iconv_handle, &psz_in, &i_in,
+ &psz_out, &i_out ) == (size_t)(-1) )
+ {
+ /* skip naughty byte. This may fail terribly for multibyte stuff,
+ * but what can we do anyway? */
+ psz_in++;
+ i_in--;
+ vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
+ }
+ vlc_iconv_close( iconv_handle );
+
+ *psz_out = '\0';
+ }
return psz_outstring;
}
for( i = 0; i < pE->i_entry_count; i++ )
{
- char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i], pE->i_item_description_length[i] );
+ char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
+ pE->i_item_description_length[i] );
char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] );
if( psz_dsc && psz_itm )
strcat( psz_extra, psz_itm );
strcat( psz_extra, ")" );
}
- if( psz_dsc )
- free( psz_dsc );
- if( psz_itm )
- free( psz_itm );
+ free( psz_dsc );
+ free( psz_itm );
}
}
}
if( p_evt->i_running_status == 0x04 && i_start > 0 )
vlc_epg_SetCurrent( p_epg, i_start );
- if( psz_name )
- free( psz_name );
- if( psz_text )
- free( psz_text );
+ free( psz_name );
+ free( psz_text );
free( psz_extra );
}
pid->b_seen = p_sys->pid[p_es->i_pid].b_seen;
if( p_es->i_type == 0x10 || p_es->i_type == 0x11 ||
- p_es->i_type == 0x12 )
+ p_es->i_type == 0x12 || p_es->i_type == 0x0f )
{
/* MPEG-4 stream: search SL_DESCRIPTOR */
dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;;
if( pid->es->fmt.i_extra > 0 )
{
pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
- memcpy( pid->es->fmt.p_extra,
- dcd->p_decoder_specific_info,
- pid->es->fmt.i_extra );
+ if( pid->es->fmt.p_extra )
+ memcpy( pid->es->fmt.p_extra,
+ dcd->p_decoder_specific_info,
+ pid->es->fmt.i_extra );
}
}
}
pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length );
- memcpy( pid->es->fmt.p_extra, p_dr->p_data,
- p_dr->i_length );
+ if( pid->es->fmt.p_extra )
+ memcpy( pid->es->fmt.p_extra, p_dr->p_data,
+ p_dr->i_length );
#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \
&& DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
for( n = 0; n < sub->i_pages_number; n++ )
{
dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
- if( p_page->i_teletext_type == 0x2
- || p_page->i_teletext_type == 0x5 )
+ if( (p_page->i_teletext_type == 0x2)
+ || (p_page->i_teletext_type == 0x5) )
{
ts_es_t *p_es;
else
{
p_es = malloc( sizeof( ts_es_t ) );
-
- es_format_Copy( &p_es->fmt, &pid->es->fmt );
- free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
- free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
+ if( !p_es ) break;
+ es_format_Copy( &p_es->fmt, &pid->es->fmt );
+ free( p_es->fmt.psz_language );
+ free( p_es->fmt.psz_description );
+ p_es->fmt.psz_language = NULL;
+ p_es->fmt.psz_description = NULL;
p_es->id = NULL;
p_es->p_pes = NULL;
p_es->i_pes_size = 0;
}
p_es->fmt.psz_language = malloc( 4 );
- memcpy( p_es->fmt.psz_language,
- p_page->i_iso6392_language_code, 3 );
- p_es->fmt.psz_language[3] = 0;
-
+ if( p_es->fmt.psz_language )
+ {
+ memcpy( p_es->fmt.psz_language,
+ p_page->i_iso6392_language_code, 3 );
+ p_es->fmt.psz_language[3] = 0;
+ }
switch( p_page->i_teletext_type )
{
case 0x2:
pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length );
- memcpy( pid->es->fmt.p_extra, p_dr->p_data,
- p_dr->i_length );
+ if( pid->es->fmt.p_extra )
+ memcpy( pid->es->fmt.p_extra, p_dr->p_data,
+ p_dr->i_length );
#ifdef _DVBPSI_DR_59_H_
pid->es->fmt.i_group = p_pmt->i_program_number;
else
{
p_es = malloc( sizeof( ts_es_t ) );
-
+ if( !p_es ) break;
es_format_Copy( &p_es->fmt, &pid->es->fmt );
free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
}
p_es->fmt.psz_language = malloc( 4 );
- memcpy( p_es->fmt.psz_language,
- p_sub->i_iso6392_language_code, 3 );
- p_es->fmt.psz_language[3] = 0;
+ if( p_es->fmt.psz_language )
+ {
+ memcpy( p_es->fmt.psz_language,
+ p_sub->i_iso6392_language_code, 3 );
+ p_es->fmt.psz_language[3] = 0;
+ }
switch( p_sub->i_subtitling_type )
{
( p_dr->p_data[4] << 8 ) | p_dr->p_data[5];
pid->es->fmt.video.i_height =
( p_dr->p_data[6] << 8 ) | p_dr->p_data[7];
- pid->es->fmt.i_extra =
+ pid->es->fmt.i_extra =
(p_dr->p_data[8] << 8) | p_dr->p_data[9];
if( pid->es->fmt.i_extra > 0 )
{
pid->es->fmt.p_extra = malloc( pid->es->fmt.i_extra );
- memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10],
- pid->es->fmt.i_extra );
+ if( pid->es->fmt.p_extra )
+ memcpy( pid->es->fmt.p_extra, &p_dr->p_data[10],
+ pid->es->fmt.i_extra );
}
}
else
{
#if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
pid->es->fmt.psz_language = malloc( 4 );
- memcpy( pid->es->fmt.psz_language,
- p_decoded->code[0].iso_639_code, 3 );
- pid->es->fmt.psz_language[3] = 0;
- msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
+ if( pid->es->fmt.psz_language )
+ {
+ memcpy( pid->es->fmt.psz_language,
+ p_decoded->code[0].iso_639_code, 3 );
+ pid->es->fmt.psz_language[3] = 0;
+ msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
+ }
switch( p_decoded->code[0].i_audio_type ) {
case 0:
pid->es->fmt.psz_description = NULL;
pid->es->fmt.p_extra_languages =
malloc( sizeof(*pid->es->fmt.p_extra_languages) *
pid->es->fmt.i_extra_languages );
- for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) {
- msg_Dbg( p_demux, "bang" );
- pid->es->fmt.p_extra_languages[i].psz_language =
- malloc(4);
- memcpy(pid->es->fmt.p_extra_languages[i].psz_language,
- p_decoded->code[i+1].iso_639_code, 3 );
- pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
- switch( p_decoded->code[i].i_audio_type ) {
- case 0:
- pid->es->fmt.p_extra_languages[i].psz_description =
- NULL;
- break;
- case 1:
- pid->es->fmt.p_extra_languages[i].psz_description =
- strdup(_("clean effects"));
- break;
- case 2:
- pid->es->fmt.p_extra_languages[i].psz_description =
- strdup(_("hearing impaired"));
- break;
- case 3:
- pid->es->fmt.p_extra_languages[i].psz_description =
- strdup(_("visual impaired commentary"));
- break;
- default:
- msg_Dbg( p_demux, "unknown audio type: %d",
- p_decoded->code[i].i_audio_type);
- pid->es->fmt.psz_description = NULL;
- break;
- }
+ if( pid->es->fmt.p_extra_languages )
+ {
+ for( i = 0; i < pid->es->fmt.i_extra_languages; i++ )
+ {
+ msg_Dbg( p_demux, "bang" );
+ pid->es->fmt.p_extra_languages[i].psz_language =
+ malloc(4);
+ if( pid->es->fmt.p_extra_languages[i].psz_language )
+ {
+ memcpy( pid->es->fmt.p_extra_languages[i].psz_language,
+ p_decoded->code[i+1].iso_639_code, 3 );
+ pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
+ }
+ switch( p_decoded->code[i].i_audio_type ) {
+ case 0:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ NULL;
+ break;
+ case 1:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("clean effects"));
+ break;
+ case 2:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("hearing impaired"));
+ break;
+ case 3:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("visual impaired commentary"));
+ break;
+ default:
+ msg_Dbg( p_demux, "unknown audio type: %d",
+ p_decoded->code[i].i_audio_type);
+ pid->es->fmt.psz_description = NULL;
+ break;
+ }
+ }
}
#else
pid->es->fmt.psz_language = malloc( 4 );
- memcpy( pid->es->fmt.psz_language,
- p_decoded->i_iso_639_code, 3 );
- pid->es->fmt.psz_language[3] = 0;
+ if( pid->es->fmt.psz_language )
+ {
+ memcpy( pid->es->fmt.psz_language,
+ p_decoded->i_iso_639_code, 3 );
+ pid->es->fmt.psz_language[3] = 0;
+ }
#endif
}
}
TAB_REMOVE( p_sys->i_pmt, p_sys->pmt, pmt_rm[i] );
}
- if( pmt_rm ) free( pmt_rm );
+ free( pmt_rm );
}
/* now create programs */
dvbpsi_DeletePAT( p_pat );
}
-
projects / vlc / blobdiff