annotate libmpdemux/aviheader.c @ 24427:50159082a80b

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