annotate libmpdemux/aviheader.c @ 15533:ddf15d233d58

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