annotate demux_avi.c @ 1421:ea0a0b9e6fbc

nosound avi seeking fixed
author arpi
date Sun, 29 Jul 2001 21:07:34 +0000
parents 65058a94df3b
children 1728d249c783
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 // AVI file parser for DEMUXER v2.6 by A'rpi/ESP-team
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
3 #include <stdio.h>
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
4 #include <stdlib.h>
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
5
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
6 extern int verbose; // defined in mplayer.c
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
7
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
8 #include "stream.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
9 #include "demuxer.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
10
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
11 #include "wine/mmreg.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
12 #include "wine/avifmt.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
13 #include "wine/vfw.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
14
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
15 #include "codec-cfg.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
16 #include "stheader.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
17
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 //static float avi_pts_frametime=1.0f/25.0f;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
19 float avi_audio_pts=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
20 float avi_video_pts=0;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
21 //float avi_video_ftime=0.04;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
22 int skip_video_frames=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 // Select ds from ID
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
25 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 int stream_id=avi_stream_id(id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
27
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
28 // printf("demux_avi_select_stream(%d) {a:%d/v:%d}\n",stream_id,
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
29 // demux->audio->id,demux->video->id);
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
30
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
31 if(demux->video->id==-1)
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
32 if(demux->v_streams[stream_id])
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
33 demux->video->id=stream_id;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
34
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
35 if(demux->audio->id==-1)
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
36 if(demux->a_streams[stream_id])
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
37 demux->audio->id=stream_id;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
38
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
39 if(stream_id==demux->audio->id){
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
40 if(!demux->audio->sh){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
41 demux->audio->sh=demux->a_streams[stream_id];
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
42 if(verbose) printf("Auto-selected AVI audio ID = %d\n",demux->audio->id);
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
43 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
44 return demux->audio;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
45 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
46 if(stream_id==demux->video->id){
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
47 if(!demux->video->sh){
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
48 demux->video->sh=demux->v_streams[stream_id];
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
49 if(verbose) printf("Auto-selected AVI video ID = %d\n",demux->video->id);
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
50 }
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
51 return demux->video;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
52 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 if(id!=mmioFOURCC('J','U','N','K')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 // unknown
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
55 if(verbose>=2) printf("Unknown chunk: %.4s (%X)\n",(char *) &id,id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 return NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
60 static int demux_avi_read_packet(demuxer_t *demux,unsigned int id,unsigned int len,int idxpos,int flags){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 int skip;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 float pts=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 demux_stream_t *ds=demux_avi_select_stream(demux,id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 if(verbose>=3) printf("demux_avi.read_packet: %X\n",id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 if(ds==demux->audio){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 pts=avi_audio_pts;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 avi_audio_pts=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 } else
1409
65058a94df3b video pts calculation fixed (Desperado-trailer.avi)
arpi
parents: 1368
diff changeset
71 if(ds==demux->video){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 // video
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 if(skip_video_frames>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74 // drop frame (seeking)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 --skip_video_frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76 ds=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 pts=avi_video_pts;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 // ezt a 2 sort lehet hogy fell kell majd cserelni:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 //avi_video_pts+=avi_pts_frametime;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 109
diff changeset
82 //avi_video_pts+=(float)avi_header.video.dwScale/(float)avi_header.video.dwRate;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 109
diff changeset
83 //avi_video_pts+=((sh_video_t*)ds->sh)->frametime;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
84 // FIXME!!!
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
85 #if 1
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
86 // printf("ds=0x%X\n",ds);
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
87 // printf("packno=%d\n",ds->pack_no);
1409
65058a94df3b video pts calculation fixed (Desperado-trailer.avi)
arpi
parents: 1368
diff changeset
88 // printf("### pack_no=%d\n",demux->video->pack_no+demux->video->packs);
65058a94df3b video pts calculation fixed (Desperado-trailer.avi)
arpi
parents: 1368
diff changeset
89 avi_video_pts = (demux->video->pack_no+demux->video->packs) *
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
90 (float)((sh_video_t*)demux->video->sh)->video.dwScale /
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
91 (float)((sh_video_t*)demux->video->sh)->video.dwRate;
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
92 #else
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 109
diff changeset
93 avi_video_pts+=(float)((sh_video_t*)(demux->video->sh))->video.dwScale/(float)((sh_video_t*)(demux->video->sh))->video.dwRate;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
94 // avi_video_pts+=avi_video_ftime;
1368
faee296c7c9a video pts calculation precision fixed
arpi
parents: 979
diff changeset
95 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 avi_audio_pts=avi_video_pts;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 // len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 skip=(len+1)&(~1); // total bytes in this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 if(ds){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103 if(verbose>=2) printf("DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id);
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
104 ds_read_packet(ds,demux->stream,len,pts,idxpos,flags);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105 skip-=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 if(skip){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108 if(verbose>=2) printf("DEMUX_AVI: Skipping %d bytes from packet %04X\n",skip,id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 stream_skip(demux->stream,skip);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 return ds?1:0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
113
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 //static int num_elementary_packets100=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
115 //static int num_elementary_packets101=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
116
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 int demux_avi_fill_buffer(demuxer_t *demux){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
122 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
123 int max_packs=128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 do{
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
127 int flags=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 AVIINDEXENTRY *idx=NULL;
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
129 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 demux->filepos=stream_tell(demux->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
131 if(demux->filepos>=demux->movi_end){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 if(stream_eof(demux->stream)) return 0;
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
136 #endif
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
137 if(demux->idx_size>0 && demux->idx_pos<demux->idx_size){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
138 unsigned int pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
140 //if(demux->idx_pos<0) printf("Fatal! idx_pos=%d\n",demux->idx_pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
142 idx=&((AVIINDEXENTRY *)demux->idx)[demux->idx_pos++];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
144 //printf("[%d]",demux->idx_pos);fflush(stdout);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
145
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 //stream_seek(demux->stream,idx.dwChunkOffset);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 //printf("IDX pos=%X idx.pos=%X idx.size=%X idx.flags=%X\n",demux->filepos,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 // pos-4,idx->dwChunkLength,idx->dwFlags);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 if(idx->dwFlags&AVIIF_LIST){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 // LIST
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 if(!demux_avi_select_stream(demux,idx->ckid)){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
154 if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 continue; // skip this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
158 pos=idx->dwChunkOffset+demux->idx_offset;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
159 if(pos<demux->movi_start || pos>=demux->movi_end){
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
160 printf("ChunkOffset out of range! idx=0x%X \n",pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 if(pos!=demux->filepos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165 printf("Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168 stream_seek(demux->stream,pos);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
169 demux->filepos=stream_tell(demux->stream);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 id=stream_read_dword_le(demux->stream);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
171 if(stream_eof(demux->stream)) return 0; // EOF!
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
172
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 if(id!=idx->ckid){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
174 printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
176 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
177 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
178 // if((len&(~1))!=(idx->dwChunkLength&(~1))){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179 // if((len)!=(idx->dwChunkLength)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180 if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
181 printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
182 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
183 }
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
184 if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 } else {
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
186 demux->filepos=stream_tell(demux->stream);
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
187 if(demux->filepos>=demux->movi_end){
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
188 demux->stream->eof=1;
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
189 return 0;
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
190 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
191 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
192 len=stream_read_dword_le(demux->stream);
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
193 if(stream_eof(demux->stream)) return 0; // EOF!
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1409
diff changeset
194
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 if(id==mmioFOURCC('L','I','S','T')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196 id=stream_read_dword_le(demux->stream); // list type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 }
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
200 ret=demux_avi_read_packet(demux,id,len,demux->idx_pos-1,flags);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 if(!ret && skip_video_frames<=0)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 if(--max_packs==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204 printf("demux: file doesn't contain the selected audio or video stream\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
209 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
213 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 int max_packs=128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 do{
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
222 int flags=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 AVIINDEXENTRY *idx=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224 int idx_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225 demux->filepos=stream_tell(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
227 if(ds==demux->video) idx_pos=demux->idx_pos_a++; else
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
228 if(ds==demux->audio) idx_pos=demux->idx_pos_v++; else
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
229 idx_pos=demux->idx_pos++;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
231 if(demux->idx_size>0 && idx_pos<demux->idx_size){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 unsigned int pos;
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
233 idx=&((AVIINDEXENTRY *)demux->idx)[idx_pos];
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
234 // idx=&demux->idx[idx_pos];
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
236 if(idx->dwFlags&AVIIF_LIST){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
237 // LIST
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 if(ds && demux_avi_select_stream(demux,idx->ckid)!=ds){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
241 if(verbose>2) printf("Skip chunk %.4s (0x%X) \n",(char *)&idx->ckid,(unsigned int)idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 continue; // skip this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
245 pos=idx->dwChunkOffset+demux->idx_offset;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
246 if(pos<demux->movi_start || pos>=demux->movi_end){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 printf("ChunkOffset out of range! current=0x%X idx=0x%X \n",demux->filepos,pos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 if(pos!=demux->filepos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 printf("Warning! pos=0x%X idx.pos=0x%X diff=%d \n",demux->filepos,pos,pos-demux->filepos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 stream_seek(demux->stream,pos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 if(stream_eof(demux->stream)) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 if(id!=idx->ckid){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
262 printf("ChunkID mismatch! raw=%.4s idx=%.4s \n",(char *)&id,(char *)&idx->ckid);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 // if((len&(~1))!=(idx->dwChunkLength&(~1))){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
267 // if((len)!=(idx->dwChunkLength)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
600
ef932c18cb14 some warnings have gone
szabii
parents: 587
diff changeset
269 printf("ChunkSize mismatch! raw=%d idx=%ld \n",len,idx->dwChunkLength);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 }
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
272 if(idx->dwFlags&AVIIF_KEYFRAME) flags=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 } else return 0;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
274 ret=demux_avi_read_packet(demux,id,len,idx_pos,flags);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
275 if(!ret && skip_video_frames<=0)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
276 if(--max_packs==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
277 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
278 printf("demux: file doesn't contain the selected audio or video stream\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
279 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
280 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
281 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
282 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
283 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
284
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
286 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 // 0 = EOF or no stream found
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288 // 1 = successfully read a packet
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
289 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 unsigned int id=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
291 unsigned int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
292 int ret=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
293 int *fpos=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
295 if(ds==demux->video) fpos=&demux->idx_pos_a; else
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
296 if(ds==demux->audio) fpos=&demux->idx_pos_v; else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
297 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
298
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
299 stream_seek(demux->stream,fpos[0]);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
300
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
301 do{
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
302
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
303 demux->filepos=stream_tell(demux->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 426
diff changeset
304 if(demux->filepos>=demux->movi_end){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 demux->stream->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308 if(stream_eof(demux->stream)) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 id=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311 len=stream_read_dword_le(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312 if(id==mmioFOURCC('L','I','S','T')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313 id=stream_read_dword_le(demux->stream); // list type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
315 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
317 if(ds==demux_avi_select_stream(demux,id)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
318 // read it!
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 600
diff changeset
319 ret=demux_avi_read_packet(demux,id,len,demux->idx_pos-1,0);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
320 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
321 // skip it!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322 int skip=(len+1)&(~1); // total bytes in this chunk
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
323 stream_skip(demux->stream,skip);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326 } while(ret!=1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 fpos[0]=stream_tell(demux->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331