/*****************************************************************************
* ps.h: Program Stream demuxer helper
*****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*****************************************************************************/
#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)
+/* 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 );
{
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 )
}
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
{
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
{
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;
}
p_pkt->i_buffer >= 9 &&
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 &&
}
/* 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;
/* 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];
+ 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] )
{
}
}
- 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 )
{
{
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;
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;