* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#define PS_TK_COUNT (512 - 0xc0)
+#include <vlc_demux.h>
+
+/* 256-0xC0 for normal stream, 256 for 0xbd stream, 256 for 0xfd stream */
+#define PS_TK_COUNT (768 - 0xc0)
#define PS_ID_TO_TK( id ) ((id) <= 0xff ? (id) - 0xc0 : \
- ((id)&0xff) + (256 - 0xc0))
+ ((id)&0xff) + (((id)&0xff00) == 0xbd00 ? 256-0xC0 : 512-0xc0) )
typedef struct ps_psm_t ps_psm_t;
-static inline int ps_id_to_type( ps_psm_t *, int );
-static inline uint8_t *ps_id_to_lang( ps_psm_t *, int );
+static inline int ps_id_to_type( const ps_psm_t *, int );
+static inline const uint8_t *ps_id_to_lang( const ps_psm_t *, int );
typedef struct
{
int i_id;
es_out_id_t *es;
es_format_t fmt;
+ mtime_t i_first_pts;
+ mtime_t i_last_pts;
} ps_track_t;
tk[i].i_skip = 0;
tk[i].i_id = 0;
tk[i].es = NULL;
+ tk[i].i_first_pts = -1;
+ tk[i].i_last_pts = -1;
es_format_Init( &tk[i].fmt, UNKNOWN_ES, 0 );
}
}
tk->i_id = i_id;
if( ( i_id&0xff00 ) == 0xbd00 )
{
- if( ( i_id&0xf8 ) == 0x88 )
+ if( ( i_id&0xf8 ) == 0x88 || (i_id&0xf8) == 0x98 )
{
es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('d','t','s',' ') );
tk->i_skip = 4;
}
- else if( ( i_id&0xf0 ) == 0x80 )
+ 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',' ') );
tk->i_skip = 4;
}
+ else if( (i_id&0xf0) == 0xb0 )
+ {
+ es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','l','p',' ') );
+ /* 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_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 );
+ return VLC_EGENERIC;
+ }
+ }
+ else if( (i_id&0xff00) == 0xfd00 )
+ {
+ 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') );
+ }
else
{
es_format_Init( &tk->fmt, UNKNOWN_ES, 0 );
/* PES packets usually contain truncated frames */
tk->fmt.b_packetized = VLC_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 );
p_pkt->i_buffer >= 9 &&
p_pkt->i_buffer >= 9 + p_pkt->p_buffer[8] )
{
+ /* VOB extension */
return 0xbd00 | p_pkt->p_buffer[9+p_pkt->p_buffer[8]];
}
+ else if( p_pkt->p_buffer[3] == 0xfd &&
+ p_pkt->i_buffer >= 9 &&
+ (p_pkt->p_buffer[6]&0xC0) == 0x80 && /* mpeg2 */
+ (p_pkt->p_buffer[7]&0x01) == 0x01 ) /* extension_flag */
+ {
+ /* ISO 13818 amendment 2 and SMPTE RP 227 */
+ const uint8_t i_flags = p_pkt->p_buffer[7];
+ int i_skip = 9;
+
+
+ /* Find PES extension */
+ if( (i_flags & 0x80 ) )
+ {
+ i_skip += 5; /* pts */
+ if( (i_flags & 0x40) )
+ i_skip += 5; /* dts */
+ }
+ if( (i_flags & 0x20 ) )
+ i_skip += 6;
+ if( (i_flags & 0x10 ) )
+ i_skip += 3;
+ if( (i_flags & 0x08 ) )
+ i_skip += 1;
+ if( (i_flags & 0x04 ) )
+ i_skip += 1;
+ if( (i_flags & 0x02 ) )
+ i_skip += 2;
+
+ if( i_skip < p_pkt->i_buffer && (p_pkt->p_buffer[i_skip]&0x01) )
+ {
+ const uint8_t i_flags2 = p_pkt->p_buffer[i_skip];
+
+ /* Find PES extension 2 */
+ i_skip += 1;
+ if( i_flags2 & 0x80 )
+ i_skip += 16;
+ if( (i_flags2 & 0x40) && i_skip < p_pkt->i_buffer )
+ i_skip += 1 + p_pkt->p_buffer[i_skip];
+ if( i_flags2 & 0x20 )
+ i_skip += 2;
+ if( i_flags2 & 0x10 )
+ i_skip += 2;
+
+ if( i_skip + 1 < p_pkt->i_buffer )
+ {
+ const int i_extension_field_length = p_pkt->p_buffer[i_skip]&0x7f;
+ if( i_extension_field_length >=1 )
+ {
+ int i_stream_id_extension_flag = (p_pkt->p_buffer[i_skip+1] >> 7)&0x1;
+ if( i_stream_id_extension_flag == 0 )
+ return 0xfd00 | (p_pkt->p_buffer[i_skip+1]&0x7f);
+ }
+ }
+ }
+ }
return p_pkt->p_buffer[3];
}
/* 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 )
+static inline int ps_pkt_size( const uint8_t *p, int i_peek )
{
if( p[3] == 0xb9 && i_peek >= 4 )
{
ps_es_t **es;
};
-static inline int ps_id_to_type( ps_psm_t *p_psm, int i_id )
+static inline int ps_id_to_type( const ps_psm_t *p_psm, int i_id )
{
int i;
for( i = 0; p_psm && i < p_psm->i_es; i++ )
{
- if( p_psm->es[i]->i_id == i_id ) return p_psm->es[i]->i_type;
+ if( p_psm->es[i]->i_id == i_id ) return p_psm->es[i]->i_type;
}
return 0;
}
-static inline uint8_t *ps_id_to_lang( ps_psm_t *p_psm, int i_id )
+static inline const uint8_t *ps_id_to_lang( const ps_psm_t *p_psm, int i_id )
{
int i;
for( i = 0; p_psm && i < p_psm->i_es; i++ )
{
- if( p_psm->es[i]->i_id == i_id ) return p_psm->es[i]->lang;
+ if( p_psm->es[i]->i_id == i_id ) return p_psm->es[i]->lang;
}
return 0;
}
{
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;
if( i_es_base + 4 + i_info_length > i_length ) break;
+ /* TODO Add support for VC-1 stream:
+ * stream_type=0xea, stream_id=0xfd AND registration
+ * descriptor 0x5 with format_identifier == 0x56432D31 (VC-1)
+ * (I need a sample that use PSM with VC-1) */
+
es.p_descriptor = 0;
es.i_descriptor = i_info_length;
if( i_info_length > 0 )
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;
+ i_es_base += 4 + i_info_length;
}
/* TODO: CRC */
projects / vlc / blobdiff