annotate libmpdemux/aviheader.c @ 4858:65730cea02e7

add half new input support for gui
author pontscho
date Mon, 25 Feb 2002 13:14:27 +0000
parents 40e8b4b8b250
children 5b852c08473f
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>
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
5
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
6 #include "config.h"
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
7 #include "mp_msg.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
8
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
9 #include "stream.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
10 #include "demuxer.h"
2338
4f3e8c8ea32f includes cleanup
arpi
parents: 2330
diff changeset
11 #include "stheader.h"
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
12
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1289
diff changeset
13 #include "bswap.h"
1342
baf646413408 ASF support for non-x86 cpus
jkeil
parents: 1309
diff changeset
14 #include "aviheader.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 #define MIN(a,b) (((a)<(b))?(a):(b))
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1289
diff changeset
18
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
19 static MainAVIHeader avih;
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
20
601
2d3a4339bb5a warnings killed
szabii
parents: 600
diff changeset
21 extern void print_avih(MainAVIHeader *h);
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1430
diff changeset
22 extern void print_avih_flags(MainAVIHeader *h);
601
2d3a4339bb5a warnings killed
szabii
parents: 600
diff changeset
23 extern void print_strh(AVIStreamHeader *h);
2d3a4339bb5a warnings killed
szabii
parents: 600
diff changeset
24 extern void print_wave_header(WAVEFORMATEX *h);
1496
8c3e93ef116d cleanup...
arpi
parents: 1492
diff changeset
25 extern void print_video_header(BITMAPINFOHEADER *h);
601
2d3a4339bb5a warnings killed
szabii
parents: 600
diff changeset
26 extern void print_index(AVIINDEXENTRY *idx,int idx_size);
2d3a4339bb5a warnings killed
szabii
parents: 600
diff changeset
27
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
28 void read_avi_header(demuxer_t *demuxer,int index_mode){
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
29 sh_audio_t *sh_audio=NULL;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
30 sh_video_t *sh_video=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 int stream_id=-1;
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
32 int idxfix_videostream=0;
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
33 int idxfix_divx=0;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
34 avi_priv_t* priv=demuxer->priv;
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
35 off_t list_end=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37 //---- AVI header:
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
38 priv->idx_size=0;
2330
8f0861360325 AVI - no audio stream fix
arpi
parents: 2310
diff changeset
39 priv->audio_streams=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 while(1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 int id=stream_read_dword_le(demuxer->stream);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 int chunksize,size2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 static int last_fccType=0;
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
44 char* hdr=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 //
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 if(stream_eof(demuxer->stream)) break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 //
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 if(id==mmioFOURCC('L','I','S','T')){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 int len=stream_read_dword_le(demuxer->stream)-4; // list size
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 id=stream_read_dword_le(demuxer->stream); // list type
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
51 mp_msg(MSGT_HEADER,MSGL_DBG2,"LIST %.4s len=%d\n",(char *) &id,len);
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
52 list_end=stream_tell(demuxer->stream)+((len+1)&(~1));
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
53 printf("list_end=0x%X\n",(int)list_end);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 if(id==listtypeAVIMOVIE){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 // found MOVI header
4154
f52e4d3f2235 workaround for broken 'muvi' chunks
arpi
parents: 3781
diff changeset
56 if(!demuxer->movi_start) demuxer->movi_start=stream_tell(demuxer->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
57 demuxer->movi_end=demuxer->movi_start+len;
1754
3e2a7150cf11 largefile printf fix
arpi
parents: 1672
diff changeset
58 mp_msg(MSGT_HEADER,MSGL_V,"Found movie at 0x%X - 0x%X\n",(int)demuxer->movi_start,(int)demuxer->movi_end);
4154
f52e4d3f2235 workaround for broken 'muvi' chunks
arpi
parents: 3781
diff changeset
59 if(demuxer->stream->end_pos) 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
60 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
61 break; // reading from non-seekable source (stdin) or forced index or no index forced
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 len=(len+1)&(~1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 stream_skip(demuxer->stream,len);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 continue;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 size2=stream_read_dword_le(demuxer->stream);
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
68 mp_msg(MSGT_HEADER,MSGL_DBG2,"CHUNK %.4s len=%d\n",(char *) &id,size2);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69 chunksize=(size2+1)&(~1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 switch(id){
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
71
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
72 // Indicates where the subject of the file is archived
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
73 case mmioFOURCC('I','A','R','L'): hdr="Archival Location";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
74 // Lists the artist of the original subject of the file;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
75 // for example, "Michaelangelo."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
76 case mmioFOURCC('I','A','R','T'): hdr="Artist";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
77 // Lists the name of the person or organization that commissioned
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
78 // the subject of the file; for example "Pope Julian II."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
79 case mmioFOURCC('I','C','M','S'): hdr="Commissioned";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
80 // Provides general comments about the file or the subject
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
81 // of the file. If the comment is several sentences long, end each
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
82 // sentence with a period. Do not include new-line characters.
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
83 case mmioFOURCC('I','C','M','T'): hdr="Comments";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
84 // Records the copyright information for the file; for example,
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
85 // "Copyright Encyclopedia International 1991." If there are multiple
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
86 // copyrights, separate them by semicolon followed by a space.
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
87 case mmioFOURCC('I','C','O','P'): hdr="Copyright";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
88 // Describes whether an image has been cropped and, if so, how it
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
89 // was cropped; for example, "lower-right corner."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
90 case mmioFOURCC('I','C','R','D'): hdr="Creation Date";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
91 // Describes whether an image has been cropped and, if so, how it
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
92 // was cropped; for example, "lower-right corner."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
93 case mmioFOURCC('I','C','R','P'): hdr="Cropped";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
94 // Specifies the size of the original subject of the file; for
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
95 // example, "8.5 in h, 11 in w."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
96 case mmioFOURCC('I','D','I','M'): hdr="Dimensions";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
97 // Stores dots per inch setting of the digitizer used to
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
98 // produce the file, such as "300."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
99 case mmioFOURCC('I','D','P','I'): hdr="Dots Per Inch";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
100 // Stores the of the engineer who worked on the file. If there are
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
101 // multiple engineers, separate the names by a semicolon and a blank;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
102 // for example, "Smith, John; Adams, Joe."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
103 case mmioFOURCC('I','E','N','G'): hdr="Engineer";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
104 // Describes the original work, such as "landscape,", "portrait,"
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
105 // "still liefe," etc.
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
106 case mmioFOURCC('I','G','N','R'): hdr="Genre";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
107 // Provides a list of keywords that refer to the file or subject of the
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
108 // file. Separate multiple keywords with a semicolon and a blank;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
109 // for example, "Seattle, aerial view; scenery."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
110 case mmioFOURCC('I','K','E','Y'): hdr="Keywords";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
111 // ILGT - Describes the changes in the lightness settings on the digitizer
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
112 // required to produce the file. Note that the format of this information
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
113 // depends on the hardware used.
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
114 case mmioFOURCC('I','L','G','T'): hdr="Lightness";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
115 // IMED - Decribes the original subject of the file, such as
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
116 // "computer image," "drawing," "lithograph," and so on.
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
117 case mmioFOURCC('I','M','E','D'): hdr="Medium";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
118 // INAM - Stores the title of the subject of the file, such as
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
119 // "Seattle from Above."
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
120 case mmioFOURCC('I','N','A','M'): hdr="Name";break;
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
121 // IPLT - Specifies the number of colors requested when digitizing
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
122 // an image, such as "256."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
123 case mmioFOURCC('I','P','L','T'): hdr="Palette Setting";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
124 // IPRD - Specifies the name of title the file was originally intended
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
125 // for, such as "Encyclopedia of Pacific Northwest Geography."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
126 case mmioFOURCC('I','P','R','D'): hdr="Product";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
127 // ISBJ - Decsribes the contents of the file, such as
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
128 // "Aerial view of Seattle."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
129 case mmioFOURCC('I','S','B','J'): hdr="Subject";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
130 // ISFT - Identifies the name of the software packages used to create the
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
131 // file, such as "Microsoft WaveEdit"
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
132 case mmioFOURCC('I','S','F','T'): hdr="Software";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
133 // ISHP - Identifies the change in sharpness for the digitizer
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
134 // required to produce the file (the format depends on the hardware used).
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
135 case mmioFOURCC('I','S','H','P'): hdr="Sharpness";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
136 // ISRC - Identifies the name of the person or organization who
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
137 // suplied the original subject of the file; for example, "Try Research."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
138 case mmioFOURCC('I','S','R','C'): hdr="Source";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
139 // ISRF - Identifies the original form of the material that was digitized,
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
140 // such as "slide," "paper," "map," and so on. This is not necessarily
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
141 // the same as IMED
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
142 case mmioFOURCC('I','S','R','F'): hdr="Source Form";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
143 // ITCH - Identifies the technician who digitized the subject file;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
144 // for example, "Smith, John."
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
145 case mmioFOURCC('I','T','C','H'): hdr="Technician";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
146 case mmioFOURCC('I','S','M','P'): hdr="Time Code";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
147 case mmioFOURCC('I','D','I','T'): hdr="Digitization Time";break;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
148
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 case ckidAVIMAINHDR: // read 'avih'
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
150 stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih)));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1289
diff changeset
151 le2me_MainAVIHeader(&avih); // swap to machine endian
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
152 chunksize-=MIN(size2,sizeof(avih));
1456
8c57a5a3c645 printfs cleanup - moved to higher -v level or moved to stderr
arpi
parents: 1430
diff changeset
153 if(verbose) print_avih(&avih); else print_avih_flags(&avih);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 case ckidSTREAMHEADER: { // read 'strh'
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 AVIStreamHeader h;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 stream_read(demuxer->stream,(char*) &h,MIN(size2,sizeof(h)));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1289
diff changeset
158 le2me_AVIStreamHeader(&h); // swap to machine endian
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 chunksize-=MIN(size2,sizeof(h));
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
160 ++stream_id;
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
161 if(h.fccType==streamtypeVIDEO){
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1038
diff changeset
162 sh_video=new_sh_video(demuxer,stream_id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
163 memcpy(&sh_video->video,&h,sizeof(h));
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
164 } else
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
165 if(h.fccType==streamtypeAUDIO){
1289
3f490fad9bdf some code clanup (first step to libdemuxer)
arpi
parents: 1038
diff changeset
166 sh_audio=new_sh_audio(demuxer,stream_id);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
167 memcpy(&sh_audio->audio,&h,sizeof(h));
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
168 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 last_fccType=h.fccType;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 if(verbose>=1) print_strh(&h);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 break; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172 case ckidSTREAMFORMAT: { // read 'strf'
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 if(last_fccType==streamtypeVIDEO){
433
0969d4ef0a34 malloc->calloc at wf/bih allocation
arpi_esp
parents: 432
diff changeset
174 sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1);
0969d4ef0a34 malloc->calloc at wf/bih allocation
arpi_esp
parents: 432
diff changeset
175 // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
176 mp_msg(MSGT_HEADER,MSGL_V,"found 'bih', %d bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER));
432
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
177 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
178 le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian
1492
2c004737cb68 print BITMAPINFOHDR too
arpi
parents: 1485
diff changeset
179 if(verbose>=1) print_video_header(sh_video->bih);
432
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
180 chunksize=0;
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
181 // sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale;
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
182 // 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
183 // if(demuxer->video->id==-1) demuxer->video->id=stream_id;
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
184 // IdxFix:
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
185 idxfix_videostream=stream_id;
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
186 switch(sh_video->bih->biCompression){
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
187 case mmioFOURCC('D', 'I', 'V', '3'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
188 case mmioFOURCC('d', 'i', 'v', '3'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
189 case mmioFOURCC('D', 'I', 'V', '4'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
190 case mmioFOURCC('d', 'i', 'v', '4'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
191 case mmioFOURCC('D', 'I', 'V', '5'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
192 case mmioFOURCC('d', 'i', 'v', '5'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
193 case mmioFOURCC('D', 'I', 'V', '6'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
194 case mmioFOURCC('d', 'i', 'v', '6'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
195 case mmioFOURCC('M', 'P', '4', '3'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
196 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
197 case mmioFOURCC('M', 'P', '4', '2'):
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
198 case mmioFOURCC('m', 'p', '4', '2'):
773
50c5a214b0d4 DIV2 added
arpi_esp
parents: 692
diff changeset
199 case mmioFOURCC('D', 'I', 'V', '2'):
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
200 case mmioFOURCC('A', 'P', '4', '1'):
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
201 idxfix_divx=1; // we can fix keyframes only for divx coded files!
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
202 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX 3 video\n");
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
203 break;
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
204 case mmioFOURCC('D', 'I', 'V', 'X'):
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
205 case mmioFOURCC('d', 'i', 'v', 'x'):
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
206 idxfix_divx=2; // we can fix keyframes only for divx coded files!
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
207 mp_msg(MSGT_HEADER,MSGL_V,"Regenerating keyframe table for DIVX 4 video\n");
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
208 break;
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
209 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210 } else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 if(last_fccType==streamtypeAUDIO){
1038
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 773
diff changeset
212 int wf_size = chunksize<sizeof(WAVEFORMATEX)?sizeof(WAVEFORMATEX):chunksize;
b36fb1ae4b53 applied solaris8/netbsd/other fixes patch by J«ärgen Keil <jk@tools.de>
arpi_esp
parents: 773
diff changeset
213 sh_audio->wf=calloc(wf_size,1);
433
0969d4ef0a34 malloc->calloc at wf/bih allocation
arpi_esp
parents: 432
diff changeset
214 // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
215 mp_msg(MSGT_HEADER,MSGL_V,"found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX));
432
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
216 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
217 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
218 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
219 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
220 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
221 }
432
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
222 chunksize=0;
5251b0c57e39 sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents: 426
diff changeset
223 if(verbose>=1) print_wave_header(sh_audio->wf);
2330
8f0861360325 AVI - no audio stream fix
arpi
parents: 2310
diff changeset
224 ++priv->audio_streams;
426
26e513f392b2 new stream selection code
arpi_esp
parents: 291
diff changeset
225 // if(demuxer->audio->id==-1) demuxer->audio->id=stream_id;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 }
4225
ed61ce9138ce more movi_end mess
arpi
parents: 4154
diff changeset
229 case ckidAVINEWINDEX:
ed61ce9138ce more movi_end mess
arpi
parents: 4154
diff changeset
230 if(demuxer->movi_end>stream_tell(demuxer->stream))
ed61ce9138ce more movi_end mess
arpi
parents: 4154
diff changeset
231 demuxer->movi_end=stream_tell(demuxer->stream); // fixup movi-end
ed61ce9138ce more movi_end mess
arpi
parents: 4154
diff changeset
232 if(index_mode){
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1289
diff changeset
233 int i;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
234 priv->idx_size=size2>>4;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
235 mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames\n",
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
236 priv->idx_size,avih.dwTotalFrames);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
237 priv->idx=malloc(priv->idx_size<<4);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
238 stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
239 for (i = 0; i < priv->idx_size; i++) // swap index to machine endian
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
240 le2me_AVIINDEXENTRY((AVIINDEXENTRY*)priv->idx + i);
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
241 chunksize-=priv->idx_size<<4;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
242 if(verbose>=2) print_index(priv->idx,priv->idx_size);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 }
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
246 if(hdr){
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
247 printf("hdr=%s size=%d\n",hdr,size2);
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
248 if(size2==3)
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
249 chunksize=1; // empty
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
250 else {
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
251 char buf[256];
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
252 int len=(size2<250)?size2:250;
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
253 stream_read(demuxer->stream,buf,len);
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
254 chunksize-=len;
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
255 buf[len]=0;
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
256 mp_msg(MSGT_HEADER,MSGL_V,"%-10s: %s\n",hdr,buf);
3071
a5f378f982cc added demux_info
alex
parents: 2763
diff changeset
257 demux_info_add(demuxer, hdr, buf);
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
258 }
1671
e6804fef9061 print AVI info block (copyright,artist etc) (-v only)
arpi
parents: 1567
diff changeset
259 }
4664
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
260 mp_msg(MSGT_HEADER,MSGL_DBG2,"list_end=0x%X pos=0x%X chunksize=0x%X next=0x%X\n",
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
261 (int)list_end, (int)stream_tell(demuxer->stream),
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
262 chunksize, (int)chunksize+stream_tell(demuxer->stream));
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
263 if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
264 mp_msg(MSGT_HEADER,MSGL_V,"Broken chunk? chunksize=%d (id=%.4s)\n",chunksize,(char *) &id);
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
265 stream_seek(demuxer->stream,list_end);
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
266 list_end=0;
40e8b4b8b250 AVI demuxer fixes:
arpi
parents: 4621
diff changeset
267 } else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 if(chunksize>0) stream_skip(demuxer->stream,chunksize); else
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
269 if(chunksize<0) mp_msg(MSGT_HEADER,MSGL_WARN,"chunksize=%d (id=%.4s)\n",chunksize,(char *) &id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
273 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
274 // build index for file:
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
275 stream_reset(demuxer->stream);
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 569
diff changeset
276 stream_seek(demuxer->stream,demuxer->movi_start);
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
277
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
278 priv->idx_pos=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
279 priv->idx_size=0;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
280 priv->idx=NULL;
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
281
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
282 while(1){
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
283 int id,len,skip;
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
284 AVIINDEXENTRY* idx;
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
285 unsigned int c;
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
286 demuxer->filepos=stream_tell(demuxer->stream);
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
287 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
288 id=stream_read_dword_le(demuxer->stream);
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
289 len=stream_read_dword_le(demuxer->stream);
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
290 if(id==mmioFOURCC('L','I','S','T')){
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
291 id=stream_read_dword_le(demuxer->stream); // list type
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
292 continue;
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
293 }
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
294 if(stream_eof(demuxer->stream)) break;
1392
20c1ff7da89c trying to fix -idx problem
arpi
parents: 1342
diff changeset
295 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
296
1499
c3517acc0497 terrible -idx bug fixed, thanx to Raphael Manfredi
arpi
parents: 1496
diff changeset
297 if(priv->idx_pos>=priv->idx_size){
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
298 // priv->idx_size+=32;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
299 priv->idx_size+=1024; // +16kB
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
300 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
301 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
302 }
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
303 idx=&((AVIINDEXENTRY *)priv->idx)[priv->idx_pos++];
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
304 idx->ckid=id;
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
305 idx->dwFlags=AVIIF_KEYFRAME; // FIXME
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
306 idx->dwChunkOffset=demuxer->filepos;
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
307 idx->dwChunkLength=len;
569
2810e747e545 small fix of DivFix
arpi_esp
parents: 568
diff changeset
308
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
309 c=stream_read_dword(demuxer->stream);
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
310
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
311 // Fix keyframes for DivX files:
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
312 if(idxfix_divx)
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
313 if(avi_stream_id(id)==idxfix_videostream){
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
314 switch(idxfix_divx){
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
315 case 1: if(c&0x40000000) idx->dwFlags=0;break; // divx 3
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
316 case 2: if(c==0x1B6) idx->dwFlags=0;break; // divx 4
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
317 }
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
318 }
3781
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
319
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
320 // update status line:
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
321 { static int lastpos;
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
322 int pos;
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
323 off_t len=demuxer->movi_end-demuxer->movi_start;
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
324 if(len){
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
325 pos=100*(demuxer->filepos-demuxer->movi_start)/len; // %
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
326 } else {
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
327 pos=(demuxer->filepos-demuxer->movi_start)>>20; // MB
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
328 }
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
329 if(pos!=lastpos){
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
330 lastpos=pos;
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
331 mp_msg(MSGT_HEADER,MSGL_STATUS,"Generating Index: %3d %s \r",
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
332 pos, len?"%":"MB");
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
333 }
3a2bd7d449f7 better, nicer progress status for index generation
arpi
parents: 3743
diff changeset
334 }
2598
a937f0024514 -idx fixes: support for divx4 and ignoring bad movi_end
arpi
parents: 2338
diff changeset
335 mp_dbg(MSGT_HEADER,MSGL_DBG2,"%08X %08X %.4s %08X %X\n",(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
336 #if 0
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
337 { unsigned char tmp[64];
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
338 int i;
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
339 stream_read(demuxer->stream,tmp,64);
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
340 printf("%.4s",&id);
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
341 for(i=0;i<64;i++) printf(" %02X",tmp[i]);
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
342 printf("\n");
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
343 }
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
344 #endif
1392
20c1ff7da89c trying to fix -idx problem
arpi
parents: 1342
diff changeset
345 skip_chunk:
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
346 skip=(len+1)&(~1); // total bytes in this chunk
568
edba7a89de99 restore keyframes of DivX files (hack)
arpi_esp
parents: 564
diff changeset
347 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
348 }
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
349 priv->idx_size=priv->idx_pos;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1499
diff changeset
350 mp_msg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size);
564
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
351 }
747759a4a28f seeking in raw/broken avi files (rebuilding index chunk)
arpi_esp
parents: 433
diff changeset
352
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 #undef MIN
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
356
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
357