Mercurial > mplayer.hg
annotate libmpdemux/aviheader.c @ 2315:c3c73ba53f0e
streaming fixed
author | arpi |
---|---|
date | Sat, 20 Oct 2001 20:35:12 +0000 |
parents | 9e059416eea6 |
children | 8f0861360325 |
rev | line source |
---|---|
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
1 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
2 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
3 #include <stdlib.h> |
1430 | 4 #include <unistd.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
5 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
6 #include "config.h" |
1567 | 7 #include "mp_msg.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
8 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
9 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
10 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
11 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
12 #include "wine/mmreg.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
13 #include "wine/avifmt.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
14 #include "wine/vfw.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
15 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
16 #include "codec-cfg.h" |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
17 #include "bswap.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
18 #include "stheader.h" |
1342 | 19 #include "aviheader.h" |
1 | 20 |
21 #define MIN(a,b) (((a)<(b))?(a):(b)) | |
22 | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
23 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
24 static MainAVIHeader avih; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
25 |
601 | 26 extern void print_avih(MainAVIHeader *h); |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1430
diff
changeset
|
27 extern void print_avih_flags(MainAVIHeader *h); |
601 | 28 extern void print_strh(AVIStreamHeader *h); |
29 extern void print_wave_header(WAVEFORMATEX *h); | |
1496 | 30 extern void print_video_header(BITMAPINFOHEADER *h); |
601 | 31 extern void print_index(AVIINDEXENTRY *idx,int idx_size); |
32 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
33 void read_avi_header(demuxer_t *demuxer,int index_mode){ |
426 | 34 sh_audio_t *sh_audio=NULL; |
35 sh_video_t *sh_video=NULL; | |
1 | 36 int stream_id=-1; |
568 | 37 int idxfix_videostream=0; |
38 int idxfix_divx=0; | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
39 avi_priv_t* priv=demuxer->priv; |
1 | 40 |
41 //---- AVI header: | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
42 priv->idx_size=0; |
1 | 43 while(1){ |
44 int id=stream_read_dword_le(demuxer->stream); | |
45 int chunksize,size2; | |
46 static int last_fccType=0; | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
47 char* hdr=NULL; |
1 | 48 // |
49 if(stream_eof(demuxer->stream)) break; | |
50 // | |
51 if(id==mmioFOURCC('L','I','S','T')){ | |
52 int len=stream_read_dword_le(demuxer->stream)-4; // list size | |
53 id=stream_read_dword_le(demuxer->stream); // list type | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
54 mp_msg(MSGT_HEADER,MSGL_DBG2,"LIST %.4s len=%d\n",(char *) &id,len); |
1 | 55 if(id==listtypeAVIMOVIE){ |
56 // found MOVI header | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
57 demuxer->movi_start=stream_tell(demuxer->stream); |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
58 demuxer->movi_end=demuxer->movi_start+len; |
1754 | 59 mp_msg(MSGT_HEADER,MSGL_V,"Found movie at 0x%X - 0x%X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); |
692 | 60 if(index_mode==-2) break; // reading from non-seekable source (stdin) |
1 | 61 len=(len+1)&(~1); |
62 stream_skip(demuxer->stream,len); | |
63 } | |
64 continue; | |
65 } | |
66 size2=stream_read_dword_le(demuxer->stream); | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
67 mp_msg(MSGT_HEADER,MSGL_DBG2,"CHUNK %.4s len=%d\n",(char *) &id,size2); |
1 | 68 chunksize=(size2+1)&(~1); |
69 switch(id){ | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
70 case mmioFOURCC('I','S','F','T'): hdr="Software";break; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
71 case mmioFOURCC('I','N','A','M'): hdr="Name";break; |
1672 | 72 case mmioFOURCC('I','S','B','J'): hdr="Title";break; |
73 case mmioFOURCC('I','A','R','T'): hdr="Author";break; | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
74 case mmioFOURCC('I','C','O','P'): hdr="Copyright";break; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
75 case mmioFOURCC('I','C','M','T'): hdr="Comment";break; |
1 | 76 case ckidAVIMAINHDR: // read 'avih' |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
77 stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih))); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
78 le2me_MainAVIHeader(&avih); // swap to machine endian |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
79 chunksize-=MIN(size2,sizeof(avih)); |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1430
diff
changeset
|
80 if(verbose) print_avih(&avih); else print_avih_flags(&avih); |
1 | 81 break; |
82 case ckidSTREAMHEADER: { // read 'strh' | |
83 AVIStreamHeader h; | |
84 stream_read(demuxer->stream,(char*) &h,MIN(size2,sizeof(h))); | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
85 le2me_AVIStreamHeader(&h); // swap to machine endian |
1 | 86 chunksize-=MIN(size2,sizeof(h)); |
426 | 87 ++stream_id; |
88 if(h.fccType==streamtypeVIDEO){ | |
1289 | 89 sh_video=new_sh_video(demuxer,stream_id); |
426 | 90 memcpy(&sh_video->video,&h,sizeof(h)); |
91 } else | |
92 if(h.fccType==streamtypeAUDIO){ | |
1289 | 93 sh_audio=new_sh_audio(demuxer,stream_id); |
426 | 94 memcpy(&sh_audio->audio,&h,sizeof(h)); |
95 } | |
1 | 96 last_fccType=h.fccType; |
97 if(verbose>=1) print_strh(&h); | |
98 break; } | |
99 case ckidSTREAMFORMAT: { // read 'strf' | |
100 if(last_fccType==streamtypeVIDEO){ | |
433 | 101 sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1); |
102 // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); | |
1567 | 103 mp_msg(MSGT_HEADER,MSGL_V,"found 'bih', %d bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER)); |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
104 stream_read(demuxer->stream,(char*) sh_video->bih,chunksize); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
105 le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian |
1492 | 106 if(verbose>=1) print_video_header(sh_video->bih); |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
107 chunksize=0; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
108 // sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
109 // sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; |
426 | 110 // if(demuxer->video->id==-1) demuxer->video->id=stream_id; |
568 | 111 // IdxFix: |
112 idxfix_videostream=stream_id; | |
113 switch(sh_video->bih->biCompression){ | |
114 case mmioFOURCC('D', 'I', 'V', '3'): | |
115 case mmioFOURCC('d', 'i', 'v', '3'): | |
116 case mmioFOURCC('D', 'I', 'V', '4'): | |
117 case mmioFOURCC('d', 'i', 'v', '4'): | |
118 case mmioFOURCC('D', 'I', 'V', '5'): | |
119 case mmioFOURCC('d', 'i', 'v', '5'): | |
120 case mmioFOURCC('D', 'I', 'V', '6'): | |
121 case mmioFOURCC('d', 'i', 'v', '6'): | |
122 case mmioFOURCC('M', 'P', '4', '3'): | |
123 case mmioFOURCC('m', 'p', '4', '3'): | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
124 case mmioFOURCC('M', 'P', '4', '2'): |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
125 case mmioFOURCC('m', 'p', '4', '2'): |
773 | 126 case mmioFOURCC('D', 'I', 'V', '2'): |
568 | 127 case mmioFOURCC('A', 'P', '4', '1'): |
128 idxfix_divx=1; // we can fix keyframes only for divx coded files! | |
129 } | |
1 | 130 } else |
131 if(last_fccType==streamtypeAUDIO){ | |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
132 int wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize; |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
133 sh_audio->wf=calloc(wf_size,1); |
433 | 134 // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); |
1567 | 135 mp_msg(MSGT_HEADER,MSGL_V,"found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX)); |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
136 stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
137 le2me_WAVEFORMATEX(sh_audio->wf); |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
138 if (sh_audio->wf->cbSize != 0 && |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
139 wf_size < sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize) { |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
140 sh_audio->wf=realloc(sh_audio->wf, sizeof(WAVEFORMATEX)+sh_audio->wf->cbSize); |
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
141 } |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
142 chunksize=0; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
143 if(verbose>=1) print_wave_header(sh_audio->wf); |
426 | 144 // if(demuxer->audio->id==-1) demuxer->audio->id=stream_id; |
1 | 145 } |
146 break; | |
147 } | |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
148 case ckidAVINEWINDEX: if(index_mode){ |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
149 int i; |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
150 priv->idx_size=size2>>4; |
1567 | 151 mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames\n", |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
152 priv->idx_size,avih.dwTotalFrames); |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
153 priv->idx=malloc(priv->idx_size<<4); |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
154 stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4); |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
155 for (i = 0; i < priv->idx_size; i++) // swap index to machine endian |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
156 le2me_AVIINDEXENTRY((AVIINDEXENTRY*)priv->idx + i); |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
157 chunksize-=priv->idx_size<<4; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
158 if(verbose>=2) print_index(priv->idx,priv->idx_size); |
1 | 159 break; |
160 } | |
161 } | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
162 if(hdr){ |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
163 char buf[256]; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
164 int len=(size2<250)?size2:250; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
165 stream_read(demuxer->stream,buf,len); |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
166 chunksize-=len; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
167 buf[len]=0; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
168 mp_msg(MSGT_HEADER,MSGL_V,"%-10s: %s\n",hdr,buf); |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
169 } |
1 | 170 if(chunksize>0) stream_skip(demuxer->stream,chunksize); else |
1567 | 171 if(chunksize<0) mp_msg(MSGT_HEADER,MSGL_WARN,"chunksize=%d (id=%.4s)\n",chunksize,(char *) &id); |
1 | 172 |
173 } | |
174 | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
175 if(index_mode>=2 || (priv->idx_size==0 && index_mode==1)){ |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
176 // build index for file: |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
177 stream_reset(demuxer->stream); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
178 stream_seek(demuxer->stream,demuxer->movi_start); |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
179 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
180 priv->idx_pos=0; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
181 priv->idx_size=0; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
182 priv->idx=NULL; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
183 |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
184 while(1){ |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
185 int id,len,skip; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
186 AVIINDEXENTRY* idx; |
569 | 187 unsigned char c; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
188 demuxer->filepos=stream_tell(demuxer->stream); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
189 if(demuxer->filepos>=demuxer->movi_end) break; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
190 id=stream_read_dword_le(demuxer->stream); |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
191 len=stream_read_dword_le(demuxer->stream); |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
192 if(id==mmioFOURCC('L','I','S','T')){ |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
193 id=stream_read_dword_le(demuxer->stream); // list type |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
194 continue; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
195 } |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
196 if(stream_eof(demuxer->stream)) break; |
1392 | 197 if(!id || avi_stream_id(id)==100) goto skip_chunk; // bad ID (or padding?) |
198 | |
1499 | 199 if(priv->idx_pos>=priv->idx_size){ |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
200 // priv->idx_size+=32; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
201 priv->idx_size+=1024; // +16kB |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
202 priv->idx=realloc(priv->idx,priv->idx_size*sizeof(AVIINDEXENTRY)); |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
203 if(!priv->idx){priv->idx_pos=0; break;} // error! |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
204 } |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
205 idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++]; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
206 idx->ckid=id; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
207 idx->dwFlags=AVIIF_KEYFRAME; // FIXME |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
208 idx->dwChunkOffset=demuxer->filepos; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
209 idx->dwChunkLength=len; |
569 | 210 |
211 c=stream_read_char(demuxer->stream); | |
568 | 212 |
213 // Fix keyframes for DivX files: | |
214 if(idxfix_divx) | |
215 if(avi_stream_id(id)==idxfix_videostream){ | |
569 | 216 if(c&0x40) idx->dwFlags=0; |
568 | 217 } |
218 | |
1567 | 219 mp_dbg(MSGT_HEADER,MSGL_DBG2,"%08X %08X %.4s %02X %X\n",demuxer->filepos,id,(char *) &id,c,(unsigned int) idx->dwFlags); |
568 | 220 #if 0 |
221 { unsigned char tmp[64]; | |
222 int i; | |
223 stream_read(demuxer->stream,tmp,64); | |
224 printf("%.4s",&id); | |
225 for(i=0;i<64;i++) printf(" %02X",tmp[i]); | |
226 printf("\n"); | |
227 } | |
228 #endif | |
1392 | 229 skip_chunk: |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
230 skip=(len+1)&(~1); // total bytes in this chunk |
568 | 231 stream_seek(demuxer->stream,8+demuxer->filepos+skip); |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
232 } |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
233 priv->idx_size=priv->idx_pos; |
1567 | 234 mp_msg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size); |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
235 } |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
236 |
1 | 237 } |
238 | |
239 #undef MIN | |
240 | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
241 |