Mercurial > mplayer.hg
comparison libmpdemux/demux_real.c @ 7472:c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
author | arpi |
---|---|
date | Sun, 22 Sep 2002 02:33:28 +0000 |
parents | 79b00f519134 |
children | 30e1c1f77737 |
comparison
equal
deleted
inserted
replaced
7471:5e56ce70b551 | 7472:c4434bdf6e51 |
---|---|
6 Based on FFmpeg's libav/rm.c. | 6 Based on FFmpeg's libav/rm.c. |
7 | 7 |
8 TODO: fix the whole syncing mechanism | 8 TODO: fix the whole syncing mechanism |
9 | 9 |
10 $Log$ | 10 $Log$ |
11 Revision 1.26 2002/09/22 02:33:26 arpi | |
12 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug | |
13 | |
11 Revision 1.25 2002/08/27 23:01:54 arpi | 14 Revision 1.25 2002/08/27 23:01:54 arpi |
12 - added matrix cracking/debugging code - disabled | 15 - added matrix cracking/debugging code - disabled |
13 - use real codec headers for sipr | 16 - use real codec headers for sipr |
14 | 17 |
15 Revision 1.24 2002/08/25 00:07:15 arpi | 18 Revision 1.24 2002/08/25 00:07:15 arpi |
576 sh_video->format==0x30335652 || | 579 sh_video->format==0x30335652 || |
577 sh_video->format==0x30325652 ) { | 580 sh_video->format==0x30325652 ) { |
578 // we need a more complicated demuxing | 581 // we need a more complicated demuxing |
579 // a block may contain multiple packets | 582 // a block may contain multiple packets |
580 // as well as a packet may be contained in multiple blocks | 583 // as well as a packet may be contained in multiple blocks |
581 int vpkg_header, vpkg_blknum, vpkg_length, vpkg_offset; | 584 int vpkg_header, vpkg_length, vpkg_offset; |
582 int vpkg_seqnum=-1, vpkg_oldseqnum=0, vpkg_seqnumread=0; | 585 int vpkg_seqnum=-1; |
583 int vpkg_subseq=0; | 586 int vpkg_subseq=0; |
584 int vpkg_ofs; | |
585 | 587 |
586 while(len>2){ | 588 while(len>2){ |
587 dp_hdr_t* dp_hdr; | 589 dp_hdr_t* dp_hdr; |
588 unsigned char* dp_data; | 590 unsigned char* dp_data; |
589 uint32_t* extra; | 591 uint32_t* extra; |
1167 else { | 1169 else { |
1168 mp_msg(MSGT_DEMUX, MSGL_ERR, "Not audio/video stream or unsupported!\n"); | 1170 mp_msg(MSGT_DEMUX, MSGL_ERR, "Not audio/video stream or unsupported!\n"); |
1169 } | 1171 } |
1170 // break; | 1172 // break; |
1171 // default: | 1173 // default: |
1172 skip_this_chunk: | 1174 //skip_this_chunk: |
1173 /* skip codec info */ | 1175 /* skip codec info */ |
1174 tmp = stream_tell(demuxer->stream) - codec_pos; | 1176 tmp = stream_tell(demuxer->stream) - codec_pos; |
1175 mp_msg(MSGT_DEMUX,MSGL_V,"### skipping %d bytes of codec info\n", codec_data_size - tmp); | 1177 mp_msg(MSGT_DEMUX,MSGL_V,"### skipping %d bytes of codec info\n", codec_data_size - tmp); |
1176 #if 0 | 1178 #if 0 |
1177 { int i; | 1179 { int i; |
1233 real_priv_t *priv = demuxer->priv; | 1235 real_priv_t *priv = demuxer->priv; |
1234 demux_stream_t *d_audio = demuxer->audio; | 1236 demux_stream_t *d_audio = demuxer->audio; |
1235 demux_stream_t *d_video = demuxer->video; | 1237 demux_stream_t *d_video = demuxer->video; |
1236 sh_audio_t *sh_audio = d_audio->sh; | 1238 sh_audio_t *sh_audio = d_audio->sh; |
1237 sh_video_t *sh_video = d_video->sh; | 1239 sh_video_t *sh_video = d_video->sh; |
1238 int video_chunk_pos = d_video->pos; | |
1239 int vid = d_video->id, aid = d_audio->id; | 1240 int vid = d_video->id, aid = d_audio->id; |
1240 int next_offset = 0; | 1241 int next_offset = 0; |
1241 int rel_seek_frames = 0; | 1242 int rel_seek_frames = 0; |
1242 int streams = 0; | 1243 int streams = 0; |
1243 | 1244 |