diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-18 01:56:10 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-18 01:56:10 +0000 |
commit | 46b83c244db87bf85ca8448dcf86433484063307 (patch) | |
tree | 7eb6ac967bce3cbbe13e1d40131885cd3e550dd5 | |
parent | 5f6b1b3d0331a340e0b7dc9b9e7ad754ac4b09b1 (diff) | |
download | mpv-46b83c244db87bf85ca8448dcf86433484063307.tar.bz2 mpv-46b83c244db87bf85ca8448dcf86433484063307.tar.xz |
PES supported again, VOB 0x1F0 problems fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@502 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | demux_mpg.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/demux_mpg.c b/demux_mpg.c index 7f8c035f3d..a5806926c5 100644 --- a/demux_mpg.c +++ b/demux_mpg.c @@ -1,5 +1,8 @@ // MPG/VOB file parser for DEMUXER v2.5 by A'rpi/ESP-team +//#define MAX_PS_PACKETSIZE 4096 +#define MAX_PS_PACKETSIZE (224*1024) + static unsigned int read_mpeg_timestamp(stream_t *s,int c){ int d,e; unsigned int pts; @@ -11,7 +14,7 @@ static unsigned int read_mpeg_timestamp(stream_t *s,int c){ return pts; } -static char dvdaudio_table[256]; +//static char dvdaudio_table[256]; //static unsigned int packet_start_pos=0; static int demux_mpg_read_packet(demuxer_t *demux,int id){ @@ -27,14 +30,23 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ if(verbose>=3) printf("demux_read_packet: %X\n",id); + if(id==0x1F0){ + demux->synced=0; // force resync after 0x1F0 + return -1; + } + // if(id==0x1BA) packet_start_pos=stream_tell(demux->stream); - if(id<0x1BC || id>0x1FF) return -1; + if(id<0x1BC || id>=0x1F0) return -1; if(id==0x1BE) return -1; // padding stream if(id==0x1BF) return -1; // private2 len=stream_read_word(demux->stream); if(verbose>=3) printf("PACKET len=%d",len); - if(len==0 || len>4096) return -2; // invalid packet !!!!!! +// if(len==0 || len>MAX_PS_PACKETSIZE) return -2; // invalid packet !!!!!! + if(len==0 || len>MAX_PS_PACKETSIZE){ + if(verbose>=2) printf("Invalid PS packet len: %d\n",len); + return -2; // invalid packet !!!!!! + } while(len>0){ // Skip stuFFing bytes c=stream_read_char(demux->stream);--len; @@ -130,7 +142,11 @@ static int demux_mpg_read_packet(demuxer_t *demux,int id){ } if(verbose>=3) printf(" => len=%d\n",len); - if(len<=0 || len>4096) return -1; // Invalid packet size +// if(len<=0 || len>MAX_PS_PACKETSIZE) return -1; // Invalid packet size + if(len<=0 || len>MAX_PS_PACKETSIZE){ + if(verbose>=2) printf("Invalid PS data len: %d\n",len); + return -1; // invalid packet !!!!!! + } if(id>=0x1C0 && id<=0x1DF){ // mpeg audio @@ -176,7 +192,7 @@ int demux_mpg_es_fill_buffer(demuxer_t *demux){ // Elementary video stream if(demux->stream->eof) return 0; demux->filepos=stream_tell(demux->stream); - ds_read_packet(demux->video,demux->stream,4096,0,0); + ds_read_packet(demux->video,demux->stream,STREAM_BUFFER_SIZE,0,0); return 1; } |