*****************************************************************************/
#include <vlc_demux.h>
+#include <assert.h>
/* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream */
#define PS_TK_COUNT (768 - 0xc0)
typedef struct
{
- vlc_bool_t b_seen;
+ bool b_seen;
int i_skip;
int i_id;
es_out_id_t *es;
int i;
for( i = 0; i < PS_TK_COUNT; i++ )
{
- tk[i].b_seen = VLC_FALSE;
+ tk[i].b_seen = false;
tk[i].i_skip = 0;
tk[i].i_id = 0;
tk[i].es = NULL;
{
es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('c','v','d',' ') );
}
+ else if( ( i_id&0xff ) == 0x10 )
+ {
+ es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('t','e','l','x') );
+ }
else
{
es_format_Init( &tk->fmt, UNKNOWN_ES, 0 );
}
/* PES packets usually contain truncated frames */
- tk->fmt.b_packetized = VLC_FALSE;
+ tk->fmt.b_packetized = false;
- if( ps_id_to_lang( p_psm , i_id ) )
+ 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;
+ if( tk->fmt.psz_language )
+ {
+ memcpy( tk->fmt.psz_language, ps_id_to_lang( p_psm , i_id ), 3 );
+ tk->fmt.psz_language[3] = 0;
+ }
}
return VLC_SUCCESS;
{
if( p_pkt->p_buffer[3] == 0xbd &&
p_pkt->i_buffer >= 9 &&
- p_pkt->i_buffer >= 9 + p_pkt->p_buffer[8] )
+ p_pkt->i_buffer >= 9 + (size_t)p_pkt->p_buffer[8] )
{
/* VOB extension */
return 0xbd00 | p_pkt->p_buffer[9+p_pkt->p_buffer[8]];
{
/* ISO 13818 amendment 2 and SMPTE RP 227 */
const uint8_t i_flags = p_pkt->p_buffer[7];
- int i_skip = 9;
-
+ unsigned int i_skip = 9;
/* Find PES extension */
if( (i_flags & 0x80 ) )
}
/* return the size of the next packet
- * XXX you need to give him at least 14 bytes (and it need to start as a
- * valid packet) */
-static inline int ps_pkt_size( uint8_t *p, int i_peek )
+ * You need to give him at least 14 bytes (and it need to start as a
+ * valid packet) It does not handle less than 6 bytes */
+static inline int ps_pkt_size( const uint8_t *p, int i_peek )
{
+ assert( i_peek >= 6 );
if( p[3] == 0xb9 && i_peek >= 4 )
{
return 4;
{
if( !ps_track_fill( &tk[i_tk], p_psm, i_id ) )
{
- tk[i_tk].b_seen = VLC_TRUE;
+ tk[i_tk].b_seen = true;
}
}
}
/* Parse a PES (and skip i_skip_extra in the payload) */
static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra )
{
- uint8_t header[30];
- int i_skip = 0;
+ uint8_t header[34];
+ unsigned int i_skip = 0;
- memcpy( header, p_pes->p_buffer, __MIN( p_pes->i_buffer, 30 ) );
+ memcpy( header, p_pes->p_buffer, __MIN( p_pes->i_buffer, 34 ) );
switch( header[3] )
{
{
while( p_psm->i_es-- )
{
- if( p_psm->es[p_psm->i_es]->i_descriptor )
- free( p_psm->es[p_psm->i_es]->p_descriptor );
+ free( p_psm->es[p_psm->i_es]->p_descriptor );
free( p_psm->es[p_psm->i_es] );
}
- if( p_psm->es ) free( p_psm->es );
+ free( p_psm->es );
p_psm->es = 0;
p_psm->i_es = 0;
while( i_es_base + 4 < i_length )
{
+ ps_es_t **tmp_es;
ps_es_t es;
es.lang[0] = es.lang[1] = es.lang[2] = 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 )
+ if( es.p_descriptor )
{
- /* Look for the ISO639 language descriptor */
- if( es.p_descriptor[i] != 0x0a )
- {
- i += es.p_descriptor[i+1] + 2;
- continue;
- }
+ memcpy( es.p_descriptor, p_buffer + i_es_base + 4, i_info_length);
- if( i <= es.i_descriptor - 6 )
+ while( i <= es.i_descriptor - 2 )
{
- es.lang[0] = es.p_descriptor[i+2];
- es.lang[1] = es.p_descriptor[i+3];
- es.lang[2] = es.p_descriptor[i+4];
+ /* 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;
}
- break;
}
}
- p_psm->es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) );
- p_psm->es[p_psm->i_es] = malloc( sizeof(ps_es_t) );
- *p_psm->es[p_psm->i_es++] = es;
- i_es_base += 4 + i_info_length;
+ tmp_es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) );
+ if( tmp_es )
+ {
+ p_psm->es = tmp_es;
+ p_psm->es[p_psm->i_es] = malloc( sizeof(ps_es_t) );
+ if( p_psm->es[p_psm->i_es] )
+ {
+ *p_psm->es[p_psm->i_es++] = es;
+ i_es_base += 4 + i_info_length;
+ }
+ }
}
/* TODO: CRC */
es_out_Del( out, tk[i].es );
tk[i] = tk_tmp;
- tk[i].b_seen = VLC_TRUE;
+ tk[i].b_seen = true;
tk[i].es = es_out_Add( out, &tk[i].fmt );
}