X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fps.h;h=ba5fe903bcde8dca4da48b8c9c3d74bb2c7be706;hb=f34e491cb21f1a1f97f4f31b519aa7739a9b48c2;hp=d0b4cc4a02d00a8c7be3e816f0dabc0396594f0d;hpb=ec6a7b8ec1fc9f070d1d5242836b1d643f9f2dd8;p=vlc diff --git a/modules/demux/ps.h b/modules/demux/ps.h index d0b4cc4a02..ba5fe903bc 100644 --- a/modules/demux/ps.h +++ b/modules/demux/ps.h @@ -1,33 +1,49 @@ /***************************************************************************** * ps.h: Program Stream demuxer helper ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2009 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include #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 ); @@ -66,43 +82,44 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) { tk->i_skip = 0; tk->i_id = i_id; - if( ( i_id&0xff00 ) == 0xbd00 ) + if( ( i_id&0xff00 ) == 0xbd00 ) /* 0xBD00 -> 0xBDFF, Private Stream 1 */ { - if( ( i_id&0xf8 ) == 0x88 || (i_id&0xf8) == 0x98 ) + if( ( i_id&0xf8 ) == 0x88 || /* 0x88 -> 0x8f - Can be DTS-HD primary audio in evob */ + ( i_id&0xf8 ) == 0x98 ) /* 0x98 -> 0x9f - Can be DTS-HD secondary audio in evob */ { 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 */ + else if( ( i_id&0xf8 ) == 0x80 || /* 0x80 -> 0x87 */ + ( i_id&0xf0 ) == 0xc0 ) /* 0xc0 -> 0xcf AC-3, Can also be DD+/E-AC3 in evob */ { es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_A52 ); tk->i_skip = 4; } - else if( (i_id&0xf0) == 0xb0 ) + else if( (i_id&0xf0) == 0xb0 ) /* 0xb0 -> 0xbf */ { es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MLP ); - /* FIXME / untested ... no known decoder (at least not in VLC/ffmpeg) */ + /* FIXME / untested ... */ } - else if( ( i_id&0xe0 ) == 0x20 ) + else if( ( i_id&0xe0 ) == 0x20 ) /* 0x20 -> 0x3f */ { es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_SPU ); tk->i_skip = 1; } - else if( ( i_id&0xf0 ) == 0xa0 ) + else if( ( i_id&0xf0 ) == 0xa0 ) /* 0xa0 -> 0xaf */ { 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 ) == 0x70 ) /* 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 ) + else if( ( i_id&0xfc ) == 0x00 ) /* 0x00 -> 0x03 */ { - 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 ) + else if( ( i_id&0xff ) == 0x10 ) /* 0x10 */ { es_format_Init( &tk->fmt, SPU_ES, VLC_CODEC_TELETEXT ); } @@ -112,10 +129,11 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) return VLC_EGENERIC; } } - else if( (i_id&0xff00) == 0xfd00 ) + else if( (i_id&0xff00) == 0xfd00 ) /* 0xFD00 -> 0xFDFF */ { uint8_t i_sub_id = i_id & 0xff; - if( i_sub_id >= 0x55 && i_sub_id <= 0x5f ) + if( ( i_sub_id >= 0x55 && i_sub_id <= 0x5f ) || /* Can be primary VC-1 in evob */ + ( i_sub_id >= 0x75 && i_sub_id <= 0x7f ) ) /* Secondary VC-1 */ { es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_VC1 ); } @@ -125,44 +143,75 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) return VLC_EGENERIC; } } - else + else if( (i_id&0xff00) == 0xa000 ) /* 0xA000 -> 0xA0FF */ { - int i_type = ps_id_to_type( p_psm , i_id ); - - es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); - - if( (i_id&0xf0) == 0xe0 && i_type == 0x1b ) - { - 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_CODEC_MP4V ); - } - else if( (i_id&0xf0) == 0xe0 && i_type == 0x02 ) + uint8_t i_sub_id = i_id & 0x07; + if( i_sub_id == 0 ) { - 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_CODEC_MP4A ); + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_DVDA_LPCM ); + tk->i_skip = 1; } - else if( ( i_id&0xe0 ) == 0xc0 && i_type == 0x11 ) + else if( i_sub_id == 1 ) { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A ); + 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&0xe0 ) == 0xc0 && i_type == 0x03 ) + else { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); + es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); + return VLC_EGENERIC; } + } + else + { + int i_type = ps_id_to_type( p_psm , i_id ); - if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xf0 ) == 0xe0 ) + es_format_Init( &tk->fmt, UNKNOWN_ES, 0 ); + + if( (i_id&0xf0) == 0xe0 ) /* 0xe0 -> 0xef */ { - es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV ); + if( i_type == 0x1b ) + { + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 ); + } + else if( i_type == 0x10 ) + { + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MP4V ); + } + else if( i_type == 0x01 || + i_type == 0x02 ) + { + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV ); + } + else if( i_id == 0xe2 || /* Primary H.264 in evob */ + i_id == 0xe3 ) /* Seconday H.264 in evob */ + { + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_H264 ); + } + else if( tk->fmt.i_cat == UNKNOWN_ES ) + { + es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_MPGV ); + } } - else if( tk->fmt.i_cat == UNKNOWN_ES && ( i_id&0xe0 ) == 0xc0 ) + else if( ( i_id&0xe0 ) == 0xc0 ) /* 0xc0 -> 0xdf */ { - es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); + if( i_type == 0x03 || + i_type == 0x04 ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); + } + else if( i_type == 0x0f ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A ); + } + else if( i_type == 0x11 ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MP4A ); + } + else if( tk->fmt.i_cat == UNKNOWN_ES ) + { + es_format_Init( &tk->fmt, AUDIO_ES, VLC_CODEC_MPGA ); + } } else if( tk->fmt.i_cat == UNKNOWN_ES ) return VLC_EGENERIC; } @@ -190,8 +239,22 @@ static inline int ps_pkt_id( block_t *p_pkt ) 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 && @@ -250,23 +313,24 @@ static inline int ps_pkt_id( block_t *p_pkt ) return p_pkt->p_buffer[3]; } -/* return the size of the next 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 */ +/* return the size of the next packet */ static inline int ps_pkt_size( const uint8_t *p, int i_peek ) { - assert( i_peek >= 6 ); - if( p[3] == 0xb9 && i_peek >= 4 ) + if( unlikely(i_peek < 4) ) + { + return -1; + } + else if( p[3] == 0xb9 ) { return 4; } else if( p[3] == 0xba ) { - if( (p[4] >> 6) == 0x01 && i_peek >= 14 ) + if( i_peek >= 14 && (p[4] >> 6) == 0x01 ) { return 14 + (p[13]&0x07); } - else if( (p[4] >> 4) == 0x02 && i_peek >= 12 ) + else if( i_peek >= 12 && (p[4] >> 4) == 0x02 ) { return 12; } @@ -350,6 +414,8 @@ static inline int ps_pkt_parse_pes( block_t *p_pes, int i_skip_extra ) { 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, 34 ) ); @@ -374,19 +440,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); } } } @@ -409,19 +475,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 @@ -436,7 +502,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 ) { @@ -446,8 +516,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; } @@ -519,15 +591,15 @@ 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; + int i_length, i_version, i_info_length, i_es_base; if( !p_psm || p_buffer[3] != 0xbc ) return VLC_EGENERIC; i_length = (uint16_t)(p_buffer[4] << 8) + p_buffer[5] + 6; if( i_length > i_buffer ) return VLC_EGENERIC; - //i_current_next_indicator = (p_buffer[6] && 0x01); - i_version = (p_buffer[6] && 0xf8); + //i_current_next_indicator = (p_buffer[6] & 0x01); + i_version = (p_buffer[6] & 0xf8); if( p_psm->i_version == i_version ) return VLC_EGENERIC; @@ -537,8 +609,8 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, if( i_info_length + 10 > i_length ) return VLC_EGENERIC; /* Elementary stream map */ - i_esm_length = (uint16_t)(p_buffer[ 10 + i_info_length ] << 8) + - p_buffer[ 11 + i_info_length]; + /* int i_esm_length = (uint16_t)(p_buffer[ 10 + i_info_length ] << 8) + + p_buffer[ 11 + i_info_length]; */ i_es_base = 12 + i_info_length; while( i_es_base + 4 < i_length ) @@ -590,7 +662,7 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, } } - tmp_es = realloc( p_psm->es, sizeof(ps_es_t *) * (p_psm->i_es+1) ); + 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; @@ -617,9 +689,15 @@ 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 = true; tk[i].es = es_out_Add( out, &tk[i].fmt );