X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdemux%2Fps.h;h=c432faa3eb35f656c9920d68fa57861a70712c5d;hb=818e9afa5d316a43d7dd75531670ec47d76f9d8c;hp=accca9e35fbc1e2177e39adc2f8c986f8c02df1b;hpb=bcddfd6382fb71b0021008eb63f1bc4a1b1bae0e;p=vlc diff --git a/modules/demux/ps.h b/modules/demux/ps.h index accca9e35f..c432faa3eb 100644 --- a/modules/demux/ps.h +++ b/modules/demux/ps.h @@ -1,7 +1,7 @@ /***************************************************************************** * ps.h: Program Stream demuxer helper ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -21,12 +21,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#include #include +#include -/* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream */ -#define PS_TK_COUNT (768 - 0xc0) +/* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream, 8 for 0xa0 AOB stream */ +#define PS_TK_COUNT (256+256+256+8 - 0xc0) +#if 0 #define PS_ID_TO_TK( id ) ((id) <= 0xff ? (id) - 0xc0 : \ ((id)&0xff) + (((id)&0xff00) == 0xbd00 ? 256-0xC0 : 512-0xc0) ) +#else +static inline int ps_id_to_tk( unsigned i_id ) +{ + if( i_id <= 0xff ) + return i_id - 0xc0; + else if( (i_id & 0xff00) == 0xbd00 ) + return 256-0xC0 + (i_id & 0xff); + else if( (i_id & 0xff00) == 0xfd00 ) + return 512-0xc0 + (i_id & 0xff); + else + return 768-0xc0 + (i_id & 0x07); +} +#define PS_ID_TO_TK( id ) ps_id_to_tk( id ) +#endif typedef struct ps_psm_t ps_psm_t; static inline int ps_id_to_type( const ps_psm_t *, int ); @@ -34,7 +51,7 @@ static inline const uint8_t *ps_id_to_lang( const ps_psm_t *, int ); typedef struct { - vlc_bool_t b_seen; + bool b_seen; int i_skip; int i_id; es_out_id_t *es; @@ -50,7 +67,7 @@ static inline void ps_track_init( ps_track_t tk[PS_TK_COUNT] ) 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; @@ -69,41 +86,41 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) { if( ( i_id&0xf8 ) == 0x88 || (i_id&0xf8) == 0x98 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('d','t','s',' ') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DTS ); tk->i_skip = 4; } else if( ( i_id&0xf0 ) == 0x80 || (i_id&0xf0) == 0xc0 ) /* AC-3, Can also be used for DD+/E-AC-3 */ { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('a','5','2',' ') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_A52 ); tk->i_skip = 4; } else if( (i_id&0xf0) == 0xb0 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','l','p',' ') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MLP ); /* FIXME / untested ... no known decoder (at least not in VLC/ffmpeg) */ } else if( ( i_id&0xe0 ) == 0x20 ) { - es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('s','p','u',' ') ); + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_SPU ); tk->i_skip = 1; } else if( ( i_id&0xf0 ) == 0xa0 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('l','p','c','m') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DVD_LPCM ); tk->i_skip = 1; } else if( ( i_id&0xff ) == 0x70 ) { - es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('o','g','t',' ') ); + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_OGT ); } else if( ( i_id&0xfc ) == 0x00 ) { - es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('c','v','d',' ') ); + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_CVD ); } else if( ( i_id&0xff ) == 0x10 ) { - es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('t','e','l','x') ); + es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_TELETEXT ); } else { @@ -116,7 +133,26 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) uint8_t i_sub_id = i_id & 0xff; if( i_sub_id >= 0x55 && i_sub_id <= 0x5f ) { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('W','V','C','1') ); + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_VC1 ); + } + else + { + es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); + return VLC_EGENERIC; + } + } + else if( (i_id&0xff00) == 0xa000 ) + { + uint8_t i_sub_id = i_id & 0x07; + if( i_sub_id == 0 ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DVDA_LPCM ); + tk->i_skip = 1; + } + else if( i_sub_id == 1 ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MLP ); + tk->i_skip = -1; /* It's a hack for variable skip value */ } else { @@ -132,44 +168,51 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) if( (i_id&0xf0) == 0xe0 && i_type == 0x1b ) { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('h','2','6','4') ); + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 ); } else if( (i_id&0xf0) == 0xe0 && i_type == 0x10 ) { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('m','p','4','v') ); + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MP4V ); } else if( (i_id&0xf0) == 0xe0 && i_type == 0x02 ) { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('m','p','g','v') ); + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV ); } else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x0f ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','p','4','a') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A ); + } + else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x11 ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A ); } else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x03 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','p','g','a') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); } if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xf0 ) == 0xe0 ) { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('m','p','g','v') ); + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV ); } else if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xe0 ) == 0xc0 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','p','g','a') ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); } else if( tk->fmt.i_cat == UNKNOWN_ES ) return VLC_EGENERIC; } /* 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 ) ) { 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; @@ -180,10 +223,24 @@ static inline int ps_pkt_id( block_t *p_pkt ) { 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] ) { + const unsigned i_start = 9 + p_pkt->p_buffer[8]; + const uint8_t i_sub_id = p_pkt->p_buffer[i_start]; + + if( (i_sub_id & 0xfe) == 0xa0 && + p_pkt->i_buffer >= i_start + 7 && + ( p_pkt->p_buffer[i_start + 5] >= 0xc0 || + p_pkt->p_buffer[i_start + 6] != 0x80 ) ) + { + /* AOB LPCM/MLP extension + * XXX for MLP I think that the !=0x80 test is not good and + * will fail for some valid files */ + return 0xa000 | (i_sub_id & 0x01); + } + /* VOB extension */ - return 0xbd00 | p_pkt->p_buffer[9+p_pkt->p_buffer[8]]; + return 0xbd00 | i_sub_id; } else if( p_pkt->p_buffer[3] == 0xfd && p_pkt->i_buffer >= 9 && @@ -192,8 +249,7 @@ static inline int ps_pkt_id( block_t *p_pkt ) { /* 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 ) ) @@ -244,10 +300,11 @@ static inline int ps_pkt_id( block_t *p_pkt ) } /* 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) */ + * 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; @@ -329,7 +386,7 @@ static inline int ps_pkt_parse_system( block_t *p_pkt, ps_psm_t *p_psm, { if( !ps_track_fill( &tk[i_tk], p_psm, i_id ) ) { - tk[i_tk].b_seen = VLC_TRUE; + tk[i_tk].b_seen = true; } } } @@ -340,10 +397,12 @@ static inline int ps_pkt_parse_system( block_t *p_pkt, ps_psm_t *p_psm, /* 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; + int64_t i_pts = -1; + int64_t i_dts = -1; - 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] ) { @@ -366,19 +425,19 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra ) if( header[7]&0x80 ) /* has pts */ { - p_pes->i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)| - (mtime_t)(header[10] << 22)| - ((mtime_t)(header[11]&0xfe) << 14)| - (mtime_t)(header[12] << 7)| - (mtime_t)(header[13] >> 1); + i_pts = ((mtime_t)(header[ 9]&0x0e ) << 29)| + (mtime_t)(header[10] << 22)| + ((mtime_t)(header[11]&0xfe) << 14)| + (mtime_t)(header[12] << 7)| + (mtime_t)(header[13] >> 1); if( header[7]&0x40 ) /* has dts */ { - p_pes->i_dts = ((mtime_t)(header[14]&0x0e ) << 29)| - (mtime_t)(header[15] << 22)| - ((mtime_t)(header[16]&0xfe) << 14)| - (mtime_t)(header[17] << 7)| - (mtime_t)(header[18] >> 1); + i_dts = ((mtime_t)(header[14]&0x0e ) << 29)| + (mtime_t)(header[15] << 22)| + ((mtime_t)(header[16]&0xfe) << 14)| + (mtime_t)(header[17] << 7)| + (mtime_t)(header[18] >> 1); } } } @@ -401,19 +460,19 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra ) if( header[i_skip]&0x20 ) { - p_pes->i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)| - (mtime_t)(header[i_skip+1] << 22)| - ((mtime_t)(header[i_skip+2]&0xfe) << 14)| - (mtime_t)(header[i_skip+3] << 7)| - (mtime_t)(header[i_skip+4] >> 1); + i_pts = ((mtime_t)(header[i_skip]&0x0e ) << 29)| + (mtime_t)(header[i_skip+1] << 22)| + ((mtime_t)(header[i_skip+2]&0xfe) << 14)| + (mtime_t)(header[i_skip+3] << 7)| + (mtime_t)(header[i_skip+4] >> 1); if( header[i_skip]&0x10 ) /* has dts */ { - p_pes->i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)| - (mtime_t)(header[i_skip+6] << 22)| - ((mtime_t)(header[i_skip+7]&0xfe) << 14)| - (mtime_t)(header[i_skip+8] << 7)| - (mtime_t)(header[i_skip+9] >> 1); + i_dts = ((mtime_t)(header[i_skip+5]&0x0e ) << 29)| + (mtime_t)(header[i_skip+6] << 22)| + ((mtime_t)(header[i_skip+7]&0xfe) << 14)| + (mtime_t)(header[i_skip+8] << 7)| + (mtime_t)(header[i_skip+9] >> 1); i_skip += 10; } else @@ -428,7 +487,11 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra ) } } - i_skip += i_skip_extra; + if( i_skip_extra >= 0 ) + i_skip += i_skip_extra; + else if( p_pes->i_buffer > i_skip + 3 && + ( ps_pkt_id( p_pes ) == 0xa001 || ps_pkt_id( p_pes ) == 0xbda1 ) ) + i_skip += 4 + p_pes->p_buffer[i_skip+3]; if( p_pes->i_buffer <= i_skip ) { @@ -438,8 +501,10 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra ) p_pes->p_buffer += i_skip; p_pes->i_buffer -= i_skip; - p_pes->i_dts = 100 * p_pes->i_dts / 9; - p_pes->i_pts = 100 * p_pes->i_pts / 9; + if( i_dts >= 0 ) + p_pes->i_dts = VLC_TS_0 + 100 * i_dts / 9; + if( i_pts >= 0 ) + p_pes->i_pts = VLC_TS_0 + 100 * i_pts / 9; return VLC_SUCCESS; } @@ -511,7 +576,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, { int i_buffer = p_pkt->i_buffer; uint8_t *p_buffer = p_pkt->p_buffer; - int i_length, i_version, i_info_length, i_esm_length, i_es_base, i; + int i_length, i_version, i_info_length, i_esm_length, i_es_base; if( !p_psm || p_buffer[3] != 0xbc ) return VLC_EGENERIC; @@ -535,6 +600,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, 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; @@ -557,31 +623,41 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, 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_or_free( 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 */ @@ -589,7 +665,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, p_psm->i_version = i_version; /* Check/Modify our existing tracks */ - for( i = 0; i < PS_TK_COUNT; i++ ) + for( int i = 0; i < PS_TK_COUNT; i++ ) { ps_track_t tk_tmp; @@ -598,11 +674,17 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, if( ps_track_fill( &tk_tmp, p_psm, tk[i].i_id ) != VLC_SUCCESS ) continue; - if( tk_tmp.fmt.i_codec == tk[i].fmt.i_codec ) continue; + if( tk_tmp.fmt.i_codec == tk[i].fmt.i_codec ) + { + es_format_Clean( &tk_tmp.fmt ); + continue; + } es_out_Del( out, tk[i].es ); + es_format_Clean( &tk[i].fmt ); + 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 ); }