Mercurial > mplayer.hg
annotate libmpdemux/aviheader.c @ 14289:6b8a0b36799b
synced to 1.72, initial translation
author | gabrov |
---|---|
date | Sat, 01 Jan 2005 02:00:17 +0000 |
parents | 25142a687b00 |
children | 85ec4f714596 |
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> |
11234
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
5 #include <errno.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
6 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
7 #include "config.h" |
1567 | 8 #include "mp_msg.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
9 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
10 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
11 #include "demuxer.h" |
2338 | 12 #include "stheader.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
13 |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
14 #include "bswap.h" |
1342 | 15 #include "aviheader.h" |
1 | 16 |
17 #define MIN(a,b) (((a)<(b))?(a):(b)) | |
18 | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
19 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
20 static MainAVIHeader avih; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
21 |
601 | 22 extern void print_avih(MainAVIHeader *h); |
1456
8c57a5a3c645
printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents:
1430
diff
changeset
|
23 extern void print_avih_flags(MainAVIHeader *h); |
601 | 24 extern void print_strh(AVIStreamHeader *h); |
25 extern void print_wave_header(WAVEFORMATEX *h); | |
1496 | 26 extern void print_video_header(BITMAPINFOHEADER *h); |
601 | 27 extern void print_index(AVIINDEXENTRY *idx,int idx_size); |
12036 | 28 extern void print_avistdindex_chunk(avistdindex_chunk *h); |
29 extern void print_avisuperindex_chunk(avisuperindex_chunk *h); | |
13187 | 30 extern void print_vprp(VideoPropHeader *vprp); |
12036 | 31 |
32 static int odml_get_vstream_id(int id, unsigned char res[]) | |
33 { | |
34 unsigned char *p = (unsigned char *)&id; | |
35 id = le2me_32(id); | |
36 | |
37 if (p[2] == 'd') { | |
38 if (res) { | |
39 res[0] = p[0]; | |
40 res[1] = p[1]; | |
41 } | |
42 return 1; | |
43 } | |
44 return 0; | |
45 } | |
46 | |
14287
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
47 /** |
12036 | 48 * Simple quicksort for AVIINDEXENTRYs |
14287
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
49 * To avoid too deep recursion, the bigger part is handled iteratively, |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
50 * thus limiting recursion to log2(n) levels. |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
51 * The pivot element is randomized to "even out" otherwise extreme cases. |
12036 | 52 */ |
53 static void avi_idx_quicksort(AVIINDEXENTRY *idx, int from, int to) | |
54 { | |
55 AVIINDEXENTRY temp; | |
14287
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
56 int lo; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
57 int hi; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
58 off_t pivot_ofs; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
59 int pivot_idx; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
60 while (from < to) { |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
61 pivot_idx = from; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
62 pivot_idx += rand() % (to - from + 1); |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
63 pivot_ofs = AVI_IDX_OFFSET(&idx[pivot_idx]); |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
64 lo = to; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
65 hi = from; |
12036 | 66 do { |
67 while(pivot_ofs < AVI_IDX_OFFSET(&idx[lo])) lo--; | |
68 while(pivot_ofs > AVI_IDX_OFFSET(&idx[hi])) hi++; | |
69 if(hi <= lo) { | |
70 if (hi != lo) { | |
71 memcpy(&temp, &idx[lo], sizeof(temp)); | |
72 memcpy(&idx[lo], &idx[hi], sizeof(temp)); | |
73 memcpy(&idx[hi], &temp, sizeof(temp)); | |
74 } | |
75 lo--; hi++; | |
76 } | |
77 } while (lo >= hi); | |
14287
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
78 if ((lo - from) < (to - hi)) { |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
79 avi_idx_quicksort(idx, from, lo); |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
80 from = hi; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
81 } else { |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
82 avi_idx_quicksort(idx, hi, to); |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
83 to = lo; |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
84 } |
25142a687b00
fix quicksort to avoid stack overflow and extreme runtimes
reimar
parents:
13700
diff
changeset
|
85 } |
12036 | 86 } |
601 | 87 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
88 void read_avi_header(demuxer_t *demuxer,int index_mode){ |
426 | 89 sh_audio_t *sh_audio=NULL; |
90 sh_video_t *sh_video=NULL; | |
1 | 91 int stream_id=-1; |
568 | 92 int idxfix_videostream=0; |
93 int idxfix_divx=0; | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
94 avi_priv_t* priv=demuxer->priv; |
4664 | 95 off_t list_end=0; |
1 | 96 |
97 //---- AVI header: | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
98 priv->idx_size=0; |
2330 | 99 priv->audio_streams=0; |
1 | 100 while(1){ |
101 int id=stream_read_dword_le(demuxer->stream); | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
102 unsigned chunksize,size2; |
1 | 103 static int last_fccType=0; |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
104 char* hdr=NULL; |
1 | 105 // |
106 if(stream_eof(demuxer->stream)) break; | |
11234
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
107 // Imply -forceidx if -saveidx is specified |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
108 if (index_file_save) |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
109 index_mode = 2; |
1 | 110 // |
111 if(id==mmioFOURCC('L','I','S','T')){ | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
112 unsigned len=stream_read_dword_le(demuxer->stream); // list size |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
113 id=stream_read_dword_le(demuxer->stream); // list type |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
114 mp_msg(MSGT_HEADER,MSGL_DBG2,"LIST %.4s len=%u\n",(char *) &id,len); |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
115 if(len >= 4) { |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
116 len -= 4; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
117 list_end=stream_tell(demuxer->stream)+((len+1)&(~1)); |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
118 } else { |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
119 mp_msg(MSGT_HEADER,MSGL_WARN,"** empty list?!\n"); |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
120 list_end = 0; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
121 } |
5933 | 122 mp_msg(MSGT_HEADER,MSGL_V,"list_end=0x%X\n",(int)list_end); |
1 | 123 if(id==listtypeAVIMOVIE){ |
124 // found MOVI header | |
4154 | 125 if(!demuxer->movi_start) demuxer->movi_start=stream_tell(demuxer->stream); |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
126 demuxer->movi_end=stream_tell(demuxer->stream)+len; |
1754 | 127 mp_msg(MSGT_HEADER,MSGL_V,"Found movie at 0x%X - 0x%X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); |
6274 | 128 if(demuxer->stream->end_pos>demuxer->movi_end) demuxer->movi_end=demuxer->stream->end_pos; |
4621
16cbaff638ac
Don't read index for -forceidx and -nodix (speedup with bad media and not needed anyway)
atmos4
parents:
4225
diff
changeset
|
129 if(index_mode==-2 || index_mode==2 || index_mode==0) |
16cbaff638ac
Don't read index for -forceidx and -nodix (speedup with bad media and not needed anyway)
atmos4
parents:
4225
diff
changeset
|
130 break; // reading from non-seekable source (stdin) or forced index or no index forced |
7762 | 131 if(list_end>0) stream_seek(demuxer->stream,list_end); // skip movi |
132 list_end=0; | |
1 | 133 } |
134 continue; | |
135 } | |
136 size2=stream_read_dword_le(demuxer->stream); | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
137 mp_msg(MSGT_HEADER,MSGL_DBG2,"CHUNK %.4s len=%u\n",(char *) &id,size2); |
1 | 138 chunksize=(size2+1)&(~1); |
139 switch(id){ | |
4664 | 140 |
141 // Indicates where the subject of the file is archived | |
142 case mmioFOURCC('I','A','R','L'): hdr="Archival Location";break; | |
143 // Lists the artist of the original subject of the file; | |
144 // for example, "Michaelangelo." | |
145 case mmioFOURCC('I','A','R','T'): hdr="Artist";break; | |
146 // Lists the name of the person or organization that commissioned | |
147 // the subject of the file; for example "Pope Julian II." | |
148 case mmioFOURCC('I','C','M','S'): hdr="Commissioned";break; | |
149 // Provides general comments about the file or the subject | |
150 // of the file. If the comment is several sentences long, end each | |
151 // sentence with a period. Do not include new-line characters. | |
152 case mmioFOURCC('I','C','M','T'): hdr="Comments";break; | |
153 // Records the copyright information for the file; for example, | |
154 // "Copyright Encyclopedia International 1991." If there are multiple | |
155 // copyrights, separate them by semicolon followed by a space. | |
156 case mmioFOURCC('I','C','O','P'): hdr="Copyright";break; | |
157 // Describes whether an image has been cropped and, if so, how it | |
158 // was cropped; for example, "lower-right corner." | |
159 case mmioFOURCC('I','C','R','D'): hdr="Creation Date";break; | |
160 // Describes whether an image has been cropped and, if so, how it | |
161 // was cropped; for example, "lower-right corner." | |
162 case mmioFOURCC('I','C','R','P'): hdr="Cropped";break; | |
163 // Specifies the size of the original subject of the file; for | |
164 // example, "8.5 in h, 11 in w." | |
165 case mmioFOURCC('I','D','I','M'): hdr="Dimensions";break; | |
166 // Stores dots per inch setting of the digitizer used to | |
167 // produce the file, such as "300." | |
168 case mmioFOURCC('I','D','P','I'): hdr="Dots Per Inch";break; | |
169 // Stores the of the engineer who worked on the file. If there are | |
170 // multiple engineers, separate the names by a semicolon and a blank; | |
171 // for example, "Smith, John; Adams, Joe." | |
172 case mmioFOURCC('I','E','N','G'): hdr="Engineer";break; | |
173 // Describes the original work, such as "landscape,", "portrait," | |
174 // "still liefe," etc. | |
175 case mmioFOURCC('I','G','N','R'): hdr="Genre";break; | |
176 // Provides a list of keywords that refer to the file or subject of the | |
177 // file. Separate multiple keywords with a semicolon and a blank; | |
178 // for example, "Seattle, aerial view; scenery." | |
179 case mmioFOURCC('I','K','E','Y'): hdr="Keywords";break; | |
180 // ILGT - Describes the changes in the lightness settings on the digitizer | |
181 // required to produce the file. Note that the format of this information | |
182 // depends on the hardware used. | |
183 case mmioFOURCC('I','L','G','T'): hdr="Lightness";break; | |
184 // IMED - Decribes the original subject of the file, such as | |
185 // "computer image," "drawing," "lithograph," and so on. | |
186 case mmioFOURCC('I','M','E','D'): hdr="Medium";break; | |
187 // INAM - Stores the title of the subject of the file, such as | |
188 // "Seattle from Above." | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
189 case mmioFOURCC('I','N','A','M'): hdr="Name";break; |
4664 | 190 // IPLT - Specifies the number of colors requested when digitizing |
191 // an image, such as "256." | |
192 case mmioFOURCC('I','P','L','T'): hdr="Palette Setting";break; | |
193 // IPRD - Specifies the name of title the file was originally intended | |
194 // for, such as "Encyclopedia of Pacific Northwest Geography." | |
195 case mmioFOURCC('I','P','R','D'): hdr="Product";break; | |
196 // ISBJ - Decsribes the contents of the file, such as | |
197 // "Aerial view of Seattle." | |
198 case mmioFOURCC('I','S','B','J'): hdr="Subject";break; | |
199 // ISFT - Identifies the name of the software packages used to create the | |
200 // file, such as "Microsoft WaveEdit" | |
201 case mmioFOURCC('I','S','F','T'): hdr="Software";break; | |
202 // ISHP - Identifies the change in sharpness for the digitizer | |
203 // required to produce the file (the format depends on the hardware used). | |
204 case mmioFOURCC('I','S','H','P'): hdr="Sharpness";break; | |
205 // ISRC - Identifies the name of the person or organization who | |
206 // suplied the original subject of the file; for example, "Try Research." | |
207 case mmioFOURCC('I','S','R','C'): hdr="Source";break; | |
208 // ISRF - Identifies the original form of the material that was digitized, | |
209 // such as "slide," "paper," "map," and so on. This is not necessarily | |
210 // the same as IMED | |
211 case mmioFOURCC('I','S','R','F'): hdr="Source Form";break; | |
212 // ITCH - Identifies the technician who digitized the subject file; | |
213 // for example, "Smith, John." | |
214 case mmioFOURCC('I','T','C','H'): hdr="Technician";break; | |
215 case mmioFOURCC('I','S','M','P'): hdr="Time Code";break; | |
216 case mmioFOURCC('I','D','I','T'): hdr="Digitization Time";break; | |
217 | |
1 | 218 case ckidAVIMAINHDR: // read 'avih' |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
219 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
|
220 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
|
221 chunksize-=MIN(size2,sizeof(avih)); |
8027 | 222 if(verbose>0) print_avih(&avih); // else print_avih_flags(&avih); |
1 | 223 break; |
224 case ckidSTREAMHEADER: { // read 'strh' | |
225 AVIStreamHeader h; | |
226 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
|
227 le2me_AVIStreamHeader(&h); // swap to machine endian |
1 | 228 chunksize-=MIN(size2,sizeof(h)); |
426 | 229 ++stream_id; |
230 if(h.fccType==streamtypeVIDEO){ | |
1289 | 231 sh_video=new_sh_video(demuxer,stream_id); |
426 | 232 memcpy(&sh_video->video,&h,sizeof(h)); |
233 } else | |
234 if(h.fccType==streamtypeAUDIO){ | |
1289 | 235 sh_audio=new_sh_audio(demuxer,stream_id); |
426 | 236 memcpy(&sh_audio->audio,&h,sizeof(h)); |
237 } | |
1 | 238 last_fccType=h.fccType; |
239 if(verbose>=1) print_strh(&h); | |
240 break; } | |
12036 | 241 case mmioFOURCC('i', 'n', 'd', 'x'): { |
12342 | 242 uint32_t i; |
12036 | 243 unsigned msize = 0; |
244 avisuperindex_chunk *s; | |
245 priv->suidx_size++; | |
246 priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk)); | |
247 s = &priv->suidx[priv->suidx_size-1]; | |
248 | |
249 chunksize-=24; | |
250 memcpy(s->fcc, "indx", 4); | |
251 s->dwSize = size2; | |
252 s->wLongsPerEntry = stream_read_word_le(demuxer->stream); | |
253 s->bIndexSubType = stream_read_char(demuxer->stream); | |
254 s->bIndexType = stream_read_char(demuxer->stream); | |
255 s->nEntriesInUse = stream_read_dword_le(demuxer->stream); | |
256 *(uint32_t *)s->dwChunkId = stream_read_dword_le(demuxer->stream); | |
257 stream_read(demuxer->stream, (char *)s->dwReserved, 3*4); | |
258 memset(s->dwReserved, 0, 3*4); | |
259 | |
260 print_avisuperindex_chunk(s); | |
261 | |
262 msize = sizeof (uint32_t) * s->wLongsPerEntry * s->nEntriesInUse; | |
263 s->aIndex = malloc(msize); | |
264 memset (s->aIndex, 0, msize); | |
265 s->stdidx = malloc (s->nEntriesInUse * sizeof (avistdindex_chunk)); | |
266 memset (s->stdidx, 0, s->nEntriesInUse * sizeof (avistdindex_chunk)); | |
267 | |
268 // now the real index of indices | |
269 for (i=0; i<s->nEntriesInUse; i++) { | |
270 chunksize-=16; | |
271 s->aIndex[i].qwOffset = stream_read_dword_le(demuxer->stream) & 0xffffffff; | |
272 s->aIndex[i].qwOffset |= ((uint64_t)stream_read_dword_le(demuxer->stream) & 0xffffffff)<<32; | |
273 s->aIndex[i].dwSize = stream_read_dword_le(demuxer->stream); | |
274 s->aIndex[i].dwDuration = stream_read_dword_le(demuxer->stream); | |
275 mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016llx 0x%04lx %ld\n", | |
276 (s->dwChunkId), i, | |
277 (uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration); | |
278 } | |
279 | |
280 break; } | |
1 | 281 case ckidSTREAMFORMAT: { // read 'strf' |
282 if(last_fccType==streamtypeVIDEO){ | |
433 | 283 sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1); |
284 // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
285 mp_msg(MSGT_HEADER,MSGL_V,"found 'bih', %u 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
|
286 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
|
287 le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian |
5418
5b852c08473f
I hate M$. it seems that MSRLE biSize is always 40 when number of colors < 256 instead of 40+colors*4
arpi
parents:
4664
diff
changeset
|
288 // fixup MS-RLE header (seems to be broken for <256 color files) |
7784 | 289 if(sh_video->bih->biCompression<=1 && sh_video->bih->biSize==40) |
5418
5b852c08473f
I hate M$. it seems that MSRLE biSize is always 40 when number of colors < 256 instead of 40+colors*4
arpi
parents:
4664
diff
changeset
|
290 sh_video->bih->biSize=chunksize; |
1492 | 291 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
|
292 chunksize=0; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
293 // 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
|
294 // sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; |
426 | 295 // if(demuxer->video->id==-1) demuxer->video->id=stream_id; |
568 | 296 // IdxFix: |
297 idxfix_videostream=stream_id; | |
298 switch(sh_video->bih->biCompression){ | |
6275 | 299 case mmioFOURCC('M', 'P', 'G', '4'): |
300 case mmioFOURCC('m', 'p', 'g', '4'): | |
301 case mmioFOURCC('D', 'I', 'V', '1'): | |
13700 | 302 idxfix_divx=3; // set index recovery mpeg4 flavour: msmpeg4v1 |
6275 | 303 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for M$ mpg4v1 video\n"); |
304 break; | |
305 case mmioFOURCC('D', 'I', 'V', '3'): | |
568 | 306 case mmioFOURCC('d', 'i', 'v', '3'): |
307 case mmioFOURCC('D', 'I', 'V', '4'): | |
308 case mmioFOURCC('d', 'i', 'v', '4'): | |
309 case mmioFOURCC('D', 'I', 'V', '5'): | |
310 case mmioFOURCC('d', 'i', 'v', '5'): | |
311 case mmioFOURCC('D', 'I', 'V', '6'): | |
312 case mmioFOURCC('d', 'i', 'v', '6'): | |
313 case mmioFOURCC('M', 'P', '4', '3'): | |
314 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
|
315 case mmioFOURCC('M', 'P', '4', '2'): |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
316 case mmioFOURCC('m', 'p', '4', '2'): |
773 | 317 case mmioFOURCC('D', 'I', 'V', '2'): |
568 | 318 case mmioFOURCC('A', 'P', '4', '1'): |
13700 | 319 idxfix_divx=1; // set index recovery mpeg4 flavour: msmpeg4v3 |
320 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX3 video\n"); | |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
321 break; |
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
322 case mmioFOURCC('D', 'I', 'V', 'X'): |
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
323 case mmioFOURCC('d', 'i', 'v', 'x'): |
6274 | 324 case mmioFOURCC('D', 'X', '5', '0'): |
13671 | 325 case mmioFOURCC('X', 'V', 'I', 'D'): |
326 case mmioFOURCC('x', 'v', 'i', 'd'): | |
13700 | 327 idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4 |
328 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for MPEG4 video\n"); | |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
329 break; |
568 | 330 } |
1 | 331 } else |
332 if(last_fccType==streamtypeAUDIO){ | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
333 unsigned wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize; |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents:
773
diff
changeset
|
334 sh_audio->wf=calloc(wf_size,1); |
433 | 335 // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); |
1567 | 336 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
|
337 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
|
338 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
|
339 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
|
340 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
|
341 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
|
342 } |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
343 chunksize=0; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
426
diff
changeset
|
344 if(verbose>=1) print_wave_header(sh_audio->wf); |
2330 | 345 ++priv->audio_streams; |
426 | 346 // if(demuxer->audio->id==-1) demuxer->audio->id=stream_id; |
1 | 347 } |
348 break; | |
349 } | |
12036 | 350 case mmioFOURCC('v', 'p', 'r', 'p'): { |
351 VideoPropHeader *vprp = malloc(chunksize); | |
12342 | 352 unsigned int i; |
12036 | 353 stream_read(demuxer->stream, (void*)vprp, chunksize); |
354 le2me_VideoPropHeader(vprp); | |
355 chunksize -= sizeof(*vprp)-sizeof(vprp->FieldInfo); | |
356 chunksize /= sizeof(VIDEO_FIELD_DESC); | |
357 if (vprp->nbFieldPerFrame > chunksize) { | |
358 vprp->nbFieldPerFrame = chunksize; | |
359 } | |
360 chunksize = 0; | |
361 for (i=0; i<vprp->nbFieldPerFrame; i++) { | |
362 le2me_VIDEO_FIELD_DESC(&vprp->FieldInfo[i]); | |
363 } | |
12061 | 364 if (sh_video) { |
12036 | 365 sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio); |
366 } | |
367 if(verbose>=1) print_vprp(vprp); | |
368 break; | |
369 } | |
370 case mmioFOURCC('d', 'm', 'l', 'h'): { | |
371 // dmlh 00 00 00 04 frms | |
372 unsigned int total_frames = stream_read_dword_le(demuxer->stream); | |
373 mp_msg(MSGT_HEADER,MSGL_V,"AVI: dmlh found (size=%d) (total_frames=%d)\n", chunksize, total_frames); | |
374 stream_skip(demuxer->stream, chunksize-4); | |
375 chunksize = 0; | |
376 } | |
377 break; | |
4225 | 378 case ckidAVINEWINDEX: |
379 if(demuxer->movi_end>stream_tell(demuxer->stream)) | |
380 demuxer->movi_end=stream_tell(demuxer->stream); // fixup movi-end | |
12036 | 381 if(index_mode && !priv->isodml){ |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1289
diff
changeset
|
382 int i; |
12036 | 383 off_t base = 0; |
384 uint32_t last_off = 0; | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
385 priv->idx_size=size2>>4; |
7762 | 386 mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames (fpos=%p)\n", |
387 priv->idx_size,avih.dwTotalFrames, stream_tell(demuxer->stream)); | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
388 priv->idx=malloc(priv->idx_size<<4); |
7762 | 389 // printf("\nindex to %p !!!!! (priv=%p)\n",priv->idx,priv); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
390 stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4); |
12737
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
391 for (i = 0; i < priv->idx_size; i++) { // swap index to machine endian |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
392 AVIINDEXENTRY *entry=(AVIINDEXENTRY*)priv->idx + i; |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
393 le2me_AVIINDEXENTRY(entry); |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
394 /* |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
395 * We (ab)use the upper word for bits 32-47 of the offset, so |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
396 * we'll clear them here. |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
397 * FIXME: AFAIK no codec uses them, but if one does it will break |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
398 */ |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
399 entry->dwFlags&=0xffff; |
ac56419ba6db
We still need to make sure the upper 16 bits of dwFlags are cleared
ranma
parents:
12736
diff
changeset
|
400 } |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
401 chunksize-=priv->idx_size<<4; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
402 if(verbose>=2) print_index(priv->idx,priv->idx_size); |
1 | 403 } |
12036 | 404 break; |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
405 /* added May 2002 */ |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
406 case mmioFOURCC('R','I','F','F'): { |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
407 char riff_type[4]; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
408 |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
409 mp_msg(MSGT_HEADER, MSGL_V, "additional RIFF header...\n"); |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
410 stream_read(demuxer->stream, riff_type, sizeof riff_type); |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
411 if (strncmp(riff_type, "AVIX", sizeof riff_type)) |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
412 mp_msg(MSGT_HEADER, MSGL_WARN, |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
413 "** warning: this is no extended AVI header..\n"); |
12362 | 414 else { |
415 /* | |
416 * We got an extended AVI header, so we need to switch to | |
417 * ODML to get seeking to work, provided we got indx chunks | |
418 * in the header (suidx_size > 0). | |
419 */ | |
420 if (priv->suidx_size > 0) | |
421 priv->isodml = 1; | |
422 } | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
423 chunksize = 0; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
424 list_end = 0; /* a new list will follow */ |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
425 break; } |
12036 | 426 case ckidAVIPADDING: |
427 stream_skip(demuxer->stream, chunksize); | |
428 chunksize = 0; | |
429 break; | |
1 | 430 } |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
431 if(hdr){ |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
432 mp_msg(MSGT_HEADER,MSGL_V,"hdr=%s size=%u\n",hdr,size2); |
4664 | 433 if(size2==3) |
434 chunksize=1; // empty | |
435 else { | |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
436 char buf[256]; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
437 int len=(size2<250)?size2:250; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
438 stream_read(demuxer->stream,buf,len); |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
439 chunksize-=len; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
440 buf[len]=0; |
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
441 mp_msg(MSGT_HEADER,MSGL_V,"%-10s: %s\n",hdr,buf); |
3071 | 442 demux_info_add(demuxer, hdr, buf); |
4664 | 443 } |
1671
e6804fef9061
print AVI info block (copyright,artist etc) (-v only)
arpi
parents:
1567
diff
changeset
|
444 } |
4664 | 445 mp_msg(MSGT_HEADER,MSGL_DBG2,"list_end=0x%X pos=0x%X chunksize=0x%X next=0x%X\n", |
446 (int)list_end, (int)stream_tell(demuxer->stream), | |
447 chunksize, (int)chunksize+stream_tell(demuxer->stream)); | |
12036 | 448 if(list_end>0 && |
449 chunksize+stream_tell(demuxer->stream) == list_end) list_end=0; | |
4664 | 450 if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){ |
451 mp_msg(MSGT_HEADER,MSGL_V,"Broken chunk? chunksize=%d (id=%.4s)\n",chunksize,(char *) &id); | |
452 stream_seek(demuxer->stream,list_end); | |
453 list_end=0; | |
454 } else | |
1 | 455 if(chunksize>0) stream_skip(demuxer->stream,chunksize); else |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
456 if((int)chunksize<0) mp_msg(MSGT_HEADER,MSGL_WARN,"chunksize=%u (id=%.4s)\n",chunksize,(char *) &id); |
1 | 457 |
458 } | |
459 | |
12728
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
460 if (priv->suidx_size > 0 && priv->idx_size == 0) { |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
461 /* |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
462 * No NEWAVIINDEX, but we got an OpenDML index. |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
463 */ |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
464 priv->isodml = 1; |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
465 } |
5369a905c5a5
If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,
ranma
parents:
12362
diff
changeset
|
466 |
12036 | 467 if (priv->isodml && (index_mode==-1 || index_mode==0)) { |
468 int i, j, k; | |
469 int safety=1000; | |
470 | |
471 avisuperindex_chunk *cx; | |
472 AVIINDEXENTRY *idx; | |
473 | |
474 | |
475 if (priv->idx_size) free(priv->idx); | |
476 priv->idx_size = 0; | |
477 priv->idx_offset = 0; | |
478 priv->idx = NULL; | |
479 | |
480 mp_msg(MSGT_HEADER, MSGL_INFO, | |
481 "AVI: ODML: Building odml index (%d superindexchunks)\n", priv->suidx_size); | |
482 | |
483 // read the standard indices | |
484 for (cx = &priv->suidx[0], i=0; i<priv->suidx_size; cx++, i++) { | |
485 stream_reset(demuxer->stream); | |
486 for (j=0; j<cx->nEntriesInUse; j++) { | |
487 int ret1, ret2; | |
488 memset(&cx->stdidx[j], 0, 32); | |
489 ret1 = stream_seek(demuxer->stream, (off_t)cx->aIndex[j].qwOffset); | |
490 ret2 = stream_read(demuxer->stream, (char *)&cx->stdidx[j], 32); | |
491 if (ret1 != 1 || ret2 != 32 || cx->stdidx[j].nEntriesInUse==0) { | |
492 // this is a broken file (probably incomplete) let the standard | |
493 // gen_index routine handle this | |
494 priv->isodml = 0; | |
495 priv->idx_size = 0; | |
496 mp_msg(MSGT_HEADER, MSGL_WARN, | |
497 "AVI: ODML: Broken (incomplete?) file detected. Will use traditional index\n"); | |
498 goto freeout; | |
499 } | |
500 | |
501 le2me_AVISTDIDXCHUNK(&cx->stdidx[j]); | |
502 print_avistdindex_chunk(&cx->stdidx[j]); | |
503 priv->idx_size += cx->stdidx[j].nEntriesInUse; | |
504 cx->stdidx[j].aIndex = malloc(cx->stdidx[j].nEntriesInUse*sizeof(avistdindex_entry)); | |
505 stream_read(demuxer->stream, (char *)cx->stdidx[j].aIndex, | |
506 cx->stdidx[j].nEntriesInUse*sizeof(avistdindex_entry)); | |
507 for (k=0;k<cx->stdidx[j].nEntriesInUse; k++) | |
508 le2me_AVISTDIDXENTRY(&cx->stdidx[j].aIndex[k]); | |
509 | |
510 cx->stdidx[j].dwReserved3 = 0; | |
511 | |
512 } | |
513 } | |
514 | |
515 /* | |
516 * We convert the index by translating all entries into AVIINDEXENTRYs | |
517 * and sorting them by offset. The result should be the same index | |
518 * we would get with -forceidx. | |
519 */ | |
520 | |
521 idx = priv->idx = malloc(priv->idx_size * sizeof (AVIINDEXENTRY)); | |
522 | |
523 for (cx = priv->suidx; cx != &priv->suidx[priv->suidx_size]; cx++) { | |
524 avistdindex_chunk *sic; | |
525 for (sic = cx->stdidx; sic != &cx->stdidx[cx->nEntriesInUse]; sic++) { | |
526 avistdindex_entry *sie; | |
527 for (sie = sic->aIndex; sie != &sic->aIndex[sic->nEntriesInUse]; sie++) { | |
528 uint64_t off = sic->qwBaseOffset + sie->dwOffset - 8; | |
529 memcpy(&idx->ckid, sic->dwChunkId, 4); | |
530 idx->dwChunkOffset = off; | |
531 idx->dwFlags = (off >> 32) << 16; | |
532 idx->dwChunkLength = sie->dwSize & 0x7fffffff; | |
533 idx->dwFlags |= (sie->dwSize&0x80000000)?0x0:AVIIF_KEYFRAME; // bit 31 denotes !keyframe | |
534 idx++; | |
535 } | |
536 } | |
537 } | |
538 avi_idx_quicksort(priv->idx, 0, priv->idx_size-1); | |
539 | |
540 /* | |
541 Hack to work around a "wrong" index in some divx odml files | |
542 (processor_burning.avi as an example) | |
543 They have ##dc on non keyframes but the ix00 tells us they are ##db. | |
544 Read the fcc of a non-keyframe vid frame and check it. | |
545 */ | |
546 | |
547 { | |
548 uint32_t id; | |
549 uint32_t db = 0; | |
550 stream_reset (demuxer->stream); | |
551 | |
552 // find out the video stream id. I have seen files with 01db. | |
553 for (idx = &((AVIINDEXENTRY *)priv->idx)[0], i=0; i<priv->idx_size; i++, idx++){ | |
554 unsigned char res[2]; | |
555 if (odml_get_vstream_id(idx->ckid, res)) { | |
556 db = mmioFOURCC(res[0], res[1], 'd', 'b'); | |
557 break; | |
558 } | |
559 } | |
560 | |
561 // find first non keyframe | |
562 for (idx = &((AVIINDEXENTRY *)priv->idx)[0], i=0; i<priv->idx_size; i++, idx++){ | |
563 if (!(idx->dwFlags & AVIIF_KEYFRAME) && idx->ckid == db) break; | |
564 } | |
565 if (i<priv->idx_size && db) { | |
566 stream_seek(demuxer->stream, AVI_IDX_OFFSET(idx)); | |
567 id = stream_read_dword_le(demuxer->stream); | |
568 if (id && id != db) // index fcc and real fcc differ? fix it. | |
569 for (idx = &((AVIINDEXENTRY *)priv->idx)[0], i=0; i<priv->idx_size; i++, idx++){ | |
570 if (!(idx->dwFlags & AVIIF_KEYFRAME) && idx->ckid == db) | |
571 idx->ckid = id; | |
572 } | |
573 } | |
574 } | |
575 | |
576 if (verbose>=2) print_index(priv->idx, priv->idx_size); | |
577 | |
578 demuxer->movi_end=demuxer->stream->end_pos; | |
579 | |
580 freeout: | |
581 | |
582 // free unneeded stuff | |
583 cx = &priv->suidx[0]; | |
584 do { | |
585 for (j=0;j<cx->nEntriesInUse;j++) | |
586 if (cx->stdidx[j].nEntriesInUse) free(cx->stdidx[j].aIndex); | |
587 free(cx->stdidx); | |
588 | |
589 } while (cx++ != &priv->suidx[priv->suidx_size-1]); | |
590 free(priv->suidx); | |
591 | |
592 } | |
593 | |
11234
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
594 /* Read a saved index file */ |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
595 if (index_file_load) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
596 FILE *fp; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
597 char magic[7]; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
598 unsigned int i; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
599 |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
600 if ((fp = fopen(index_file_load, "r")) == NULL) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
601 mp_msg(MSGT_HEADER,MSGL_ERR, "Can't read index file %s: %s\n", index_file_load, strerror(errno)); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
602 goto gen_index; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
603 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
604 fread(&magic, 6, 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
605 if (strncmp(magic, "MPIDX1", 6)) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
606 mp_msg(MSGT_HEADER,MSGL_ERR, "%s is not a valid MPlayer index file\n", index_file_load); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
607 goto gen_index; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
608 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
609 fread(&priv->idx_size, sizeof(priv->idx_size), 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
610 priv->idx=malloc(priv->idx_size*sizeof(AVIINDEXENTRY)); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
611 if (!priv->idx) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
612 mp_msg(MSGT_HEADER,MSGL_ERR, "Could not allocate memory for index data from %s\n", index_file_load); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
613 priv->idx_size = 0; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
614 goto gen_index; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
615 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
616 |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
617 for (i=0; i<priv->idx_size;i++) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
618 AVIINDEXENTRY *idx; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
619 idx=&((AVIINDEXENTRY *)priv->idx)[i]; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
620 fread(idx, sizeof(AVIINDEXENTRY), 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
621 if (feof(fp)) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
622 mp_msg(MSGT_HEADER,MSGL_ERR, "Premature end of index file %s\n", index_file_load); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
623 free(priv->idx); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
624 priv->idx_size = 0; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
625 goto gen_index; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
626 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
627 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
628 fclose(fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
629 mp_msg(MSGT_HEADER,MSGL_INFO, "Loaded index file: %s\n", index_file_load); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
630 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
631 gen_index: |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
632 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
|
633 // build index for file: |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
634 stream_reset(demuxer->stream); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
569
diff
changeset
|
635 stream_seek(demuxer->stream,demuxer->movi_start); |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
636 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
637 priv->idx_pos=0; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
638 priv->idx_size=0; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
639 priv->idx=NULL; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
640 |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
641 while(1){ |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
642 int id; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
643 unsigned len; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
644 off_t skip; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
645 AVIINDEXENTRY* idx; |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
646 unsigned int c; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
647 demuxer->filepos=stream_tell(demuxer->stream); |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
648 if(demuxer->filepos>=demuxer->movi_end && demuxer->movi_start<demuxer->movi_end) break; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
649 id=stream_read_dword_le(demuxer->stream); |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
650 len=stream_read_dword_le(demuxer->stream); |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
651 if(id==mmioFOURCC('L','I','S','T') || id==mmioFOURCC('R', 'I', 'F', 'F')){ |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
652 id=stream_read_dword_le(demuxer->stream); // list or RIFF type |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
653 continue; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
654 } |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
655 if(stream_eof(demuxer->stream)) break; |
1392 | 656 if(!id || avi_stream_id(id)==100) goto skip_chunk; // bad ID (or padding?) |
657 | |
1499 | 658 if(priv->idx_pos>=priv->idx_size){ |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
659 // priv->idx_size+=32; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
660 priv->idx_size+=1024; // +16kB |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
661 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
|
662 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
|
663 } |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
664 idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++]; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
665 idx->ckid=id; |
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
666 idx->dwFlags=AVIIF_KEYFRAME; // FIXME |
12036 | 667 idx->dwFlags|=(demuxer->filepos>>16)&0xffff0000U; |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
668 idx->dwChunkOffset=(unsigned long)demuxer->filepos; |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
669 idx->dwChunkLength=len; |
569 | 670 |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
671 c=stream_read_dword(demuxer->stream); |
568 | 672 |
673 // Fix keyframes for DivX files: | |
674 if(idxfix_divx) | |
675 if(avi_stream_id(id)==idxfix_videostream){ | |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
676 switch(idxfix_divx){ |
6275 | 677 case 3: c=stream_read_dword(demuxer->stream)<<5; //skip 32+5 bits for m$mpeg4v1 |
12036 | 678 case 1: if(c&0x40000000) idx->dwFlags&=~AVIIF_KEYFRAME;break; // divx 3 |
679 case 2: if(c==0x1B6) idx->dwFlags&=~AVIIF_KEYFRAME;break; // divx 4 | |
2598
a937f0024514
-idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents:
2338
diff
changeset
|
680 } |
568 | 681 } |
3781 | 682 |
683 // update status line: | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
684 { static off_t lastpos; |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
685 off_t pos; |
3781 | 686 off_t len=demuxer->movi_end-demuxer->movi_start; |
687 if(len){ | |
688 pos=100*(demuxer->filepos-demuxer->movi_start)/len; // % | |
689 } else { | |
690 pos=(demuxer->filepos-demuxer->movi_start)>>20; // MB | |
691 } | |
692 if(pos!=lastpos){ | |
693 lastpos=pos; | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
694 mp_msg(MSGT_HEADER,MSGL_STATUS,"Generating Index: %3lu %s \r", |
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
695 (unsigned long)pos, len?"%":"MB"); |
3781 | 696 } |
697 } | |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
698 mp_dbg(MSGT_HEADER,MSGL_DBG2,"%08X %08X %.4s %08X %X\n",(unsigned int)demuxer->filepos,id,(char *) &id,(int)c,(unsigned int) idx->dwFlags); |
568 | 699 #if 0 |
700 { unsigned char tmp[64]; | |
701 int i; | |
702 stream_read(demuxer->stream,tmp,64); | |
703 printf("%.4s",&id); | |
704 for(i=0;i<64;i++) printf(" %02X",tmp[i]); | |
705 printf("\n"); | |
706 } | |
707 #endif | |
1392 | 708 skip_chunk: |
6056
f980563afdbc
big (>2GB) AVI files support - patch by Wolfram Gloger <wg@malloc.de>
arpi
parents:
5933
diff
changeset
|
709 skip=(len+1)&(~1UL); // total bytes in this chunk |
568 | 710 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
|
711 } |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
712 priv->idx_size=priv->idx_pos; |
1567 | 713 mp_msg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size); |
7762 | 714 if(verbose>=2) print_index(priv->idx,priv->idx_size); |
11234
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
715 |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
716 /* Write generated index to a file */ |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
717 if (index_file_save) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
718 FILE *fp; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
719 unsigned int i; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
720 |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
721 if ((fp=fopen(index_file_save, "w")) == NULL) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
722 mp_msg(MSGT_HEADER,MSGL_ERR, "Couldn't write index file %s: %s\n", index_file_save, strerror(errno)); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
723 return; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
724 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
725 fwrite("MPIDX1", 6, 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
726 fwrite(&priv->idx_size, sizeof(priv->idx_size), 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
727 for (i=0; i<priv->idx_size; i++) { |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
728 AVIINDEXENTRY *idx = &((AVIINDEXENTRY *)priv->idx)[i]; |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
729 fwrite(idx, sizeof(AVIINDEXENTRY), 1, fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
730 } |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
731 fclose(fp); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
732 mp_msg(MSGT_HEADER,MSGL_INFO, "Saved index file: %s\n", index_file_save); |
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
8027
diff
changeset
|
733 } |
564
747759a4a28f
seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents:
433
diff
changeset
|
734 } |
1 | 735 } |
736 | |
737 #undef MIN | |
738 | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
739 |