Mercurial > mplayer.hg
annotate libmpdemux/muxer_avi.c @ 19320:06eef86d21cc
removed some useless includes
author | ben |
---|---|
date | Fri, 04 Aug 2006 19:38:59 +0000 |
parents | a8e681ad7c90 |
children | 81714f6e2cb5 |
rev | line source |
---|---|
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
1
diff
changeset
|
1 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
1
diff
changeset
|
2 #include <stdlib.h> |
2529 | 3 #include <string.h> |
8585 | 4 #include <inttypes.h> |
8591 | 5 #include <unistd.h> |
12036 | 6 #include <limits.h> |
2529 | 7 |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2529
diff
changeset
|
8 #include "config.h" |
17012 | 9 #include "version.h" |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2529
diff
changeset
|
10 |
12036 | 11 #include "stream.h" |
12 #include "demuxer.h" | |
13 #include "stheader.h" | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
1
diff
changeset
|
14 |
6918 | 15 #include "bswap.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
1
diff
changeset
|
16 |
8585 | 17 #include "muxer.h" |
6918 | 18 #include "aviheader.h" |
12341
0db4a3a5b01d
removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents:
12235
diff
changeset
|
19 #include "ms_hdr.h" |
12036 | 20 #include "mp_msg.h" |
17065
cf6bfdf41143
Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents:
17023
diff
changeset
|
21 #include "help_mp.h" |
1 | 22 |
7145
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
23 extern char *info_name; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
24 extern char *info_artist; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
25 extern char *info_genre; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
26 extern char *info_subject; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
27 extern char *info_copyright; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
28 extern char *info_sourceform; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
29 extern char *info_comment; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
30 |
12036 | 31 /* #define ODML_CHUNKLEN 0x02000000 */ /* for testing purposes */ |
32 #define ODML_CHUNKLEN 0x40000000 | |
33 #define ODML_NOTKEYFRAME 0x80000000U | |
34 #define MOVIALIGN 0x00001000 | |
35 | |
12061 | 36 float avi_aspect_override = -1.0; |
12363 | 37 int write_odml = 1; |
12051 | 38 |
12036 | 39 struct avi_odmlidx_entry { |
40 uint64_t ofs; | |
41 uint32_t len; | |
42 uint32_t flags; | |
43 }; | |
44 | |
45 struct avi_odmlsuperidx_entry { | |
46 uint64_t ofs; | |
47 uint32_t len; | |
48 uint32_t duration; | |
49 }; | |
50 | |
51 struct avi_stream_info { | |
52 int idxsize; | |
53 int idxpos; | |
54 int superidxpos; | |
55 int superidxsize; | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
56 int riffofspos; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
57 int riffofssize; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
58 off_t *riffofs; |
12036 | 59 struct avi_odmlidx_entry *idx; |
60 struct avi_odmlsuperidx_entry *superidx; | |
61 }; | |
62 | |
12061 | 63 static unsigned int avi_aspect(muxer_stream_t *vstream) |
64 { | |
65 int x,y; | |
66 float aspect = vstream->aspect; | |
67 | |
68 if (avi_aspect_override > 0.0) { | |
69 aspect = avi_aspect_override; | |
70 } | |
71 | |
72 if (aspect <= 0.0) return 0; | |
73 | |
74 if (aspect > 15.99/9.0 && aspect < 16.01/9.0) { | |
75 return MAKE_AVI_ASPECT(16, 9); | |
76 } | |
77 if (aspect > 3.99/3.0 && aspect < 4.01/3.0) { | |
78 return MAKE_AVI_ASPECT(4, 3); | |
79 } | |
80 | |
81 if (aspect >= 1.0) { | |
82 x = 16384; | |
83 y = (float)x / aspect; | |
84 } else { | |
85 y = 16384; | |
86 x = (float)y * aspect; | |
87 } | |
88 | |
89 return MAKE_AVI_ASPECT(x, y); | |
90 } | |
91 | |
8585 | 92 static muxer_stream_t* avifile_new_stream(muxer_t *muxer,int type){ |
12036 | 93 struct avi_stream_info *si; |
8585 | 94 muxer_stream_t* s; |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
95 if (!muxer) return NULL; |
8585 | 96 if(muxer->avih.dwStreams>=MUXER_MAX_STREAMS){ |
12036 | 97 mp_msg(MSGT_MUXER, MSGL_ERR, "Too many streams! increase MUXER_MAX_STREAMS !\n"); |
2529 | 98 return NULL; |
99 } | |
8585 | 100 s=malloc(sizeof(muxer_stream_t)); |
101 memset(s,0,sizeof(muxer_stream_t)); | |
2529 | 102 if(!s) return NULL; // no mem!? |
103 muxer->streams[muxer->avih.dwStreams]=s; | |
104 s->type=type; | |
105 s->id=muxer->avih.dwStreams; | |
106 s->timer=0.0; | |
2652 | 107 s->size=0; |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
108 s->muxer=muxer; |
12036 | 109 s->priv=si=malloc(sizeof(struct avi_stream_info)); |
110 memset(si,0,sizeof(struct avi_stream_info)); | |
111 si->idxsize=256; | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
112 si->idx=calloc(si->idxsize, sizeof(struct avi_odmlidx_entry)); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
113 si->riffofssize=16; |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
114 si->riffofs=calloc((si->riffofssize+1), sizeof(off_t)); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
115 memset(si->riffofs, 0, sizeof(off_t)*si->riffofssize); |
12036 | 116 |
2529 | 117 switch(type){ |
8585 | 118 case MUXER_TYPE_VIDEO: |
2529 | 119 s->ckid=mmioFOURCC(('0'+s->id/10),('0'+(s->id%10)),'d','c'); |
120 s->h.fccType=streamtypeVIDEO; | |
121 if(!muxer->def_v) muxer->def_v=s; | |
122 break; | |
8585 | 123 case MUXER_TYPE_AUDIO: |
2529 | 124 s->ckid=mmioFOURCC(('0'+s->id/10),('0'+(s->id%10)),'w','b'); |
125 s->h.fccType=streamtypeAUDIO; | |
126 break; | |
127 default: | |
12036 | 128 mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! unknown stream type: %d\n",type); |
2529 | 129 return NULL; |
130 } | |
131 muxer->avih.dwStreams++; | |
132 return s; | |
133 } | |
1 | 134 |
2529 | 135 static void write_avi_chunk(FILE *f,unsigned int id,int len,void* data){ |
6918 | 136 int le_len = le2me_32(len); |
137 int le_id = le2me_32(id); | |
138 fwrite(&le_id,4,1,f); | |
139 fwrite(&le_len,4,1,f); | |
140 | |
1 | 141 if(len>0){ |
142 if(data){ | |
143 // DATA | |
144 fwrite(data,len,1,f); | |
145 if(len&1){ // padding | |
146 unsigned char zerobyte=0; | |
147 fwrite(&zerobyte,1,1,f); | |
148 } | |
149 } else { | |
150 // JUNK | |
151 char *avi_junk_data="[= MPlayer junk data! =]"; | |
152 if(len&1) ++len; // padding | |
153 while(len>0){ | |
154 int l=strlen(avi_junk_data); | |
155 if(l>len) l=len; | |
156 fwrite(avi_junk_data,l,1,f); | |
157 len-=l; | |
158 } | |
159 } | |
160 } | |
2529 | 161 } |
162 | |
12036 | 163 static void write_avi_list(FILE *f,unsigned int id,int len); |
12363 | 164 static void avifile_write_standard_index(muxer_t *muxer); |
12036 | 165 |
166 static void avifile_odml_new_riff(muxer_t *muxer) | |
167 { | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
168 struct avi_stream_info *vsi = muxer->def_v->priv; |
12036 | 169 FILE *f = muxer->file; |
170 uint32_t riff[3]; | |
171 | |
12497
da17b2c262de
no kabbe-bytes or men in black or any of that nonsense here...
rfelker
parents:
12363
diff
changeset
|
172 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: Starting new RIFF chunk at %dMB.\n", (int)(muxer->file_end/1024/1024)); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
173 |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
174 vsi->riffofspos++; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
175 if (vsi->riffofspos>=vsi->riffofssize) { |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
176 vsi->riffofssize+=16; |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
177 vsi->riffofs=realloc_struct(vsi->riffofs,(vsi->riffofssize+1),sizeof(off_t)); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
178 } |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
179 vsi->riffofs[vsi->riffofspos] = ftello(f); |
12036 | 180 |
181 /* RIFF/AVIX chunk */ | |
182 riff[0]=le2me_32(mmioFOURCC('R','I','F','F')); | |
183 riff[1]=0; | |
184 riff[2]=le2me_32(mmioFOURCC('A','V','I','X')); | |
185 fwrite(riff,12,1,f); | |
186 | |
187 write_avi_list(f,listtypeAVIMOVIE,0); | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
188 |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
189 muxer->file_end = ftello(f); |
12036 | 190 } |
191 | |
13250 | 192 static void avifile_write_header(muxer_t *muxer); |
193 | |
17487
fa17424b4c7b
change muxer_write_chunk() so that pts/dts _could_ be passed from encoder to muxer
michael
parents:
17366
diff
changeset
|
194 static void avifile_write_chunk(muxer_stream_t *s,size_t len,unsigned int flags, double dts, double pts){ |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
195 off_t rifflen; |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
196 muxer_t *muxer=s->muxer; |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
197 struct avi_stream_info *si = s->priv; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
198 struct avi_stream_info *vsi = muxer->def_v->priv; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
199 int paddedlen = len + (len&1); |
2529 | 200 |
13249
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
201 if (s->type == MUXER_TYPE_VIDEO && !s->h.dwSuggestedBufferSize) { |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
202 off_t pos=ftell(muxer->file); |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
203 fseek(muxer->file, 0, SEEK_SET); |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
204 avifile_write_header(muxer); |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
205 fseek(muxer->file, pos, SEEK_SET); |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
206 } |
a6642a4330fa
ensure that avi files have a valid header as soon as possible.
rfelker
parents:
12497
diff
changeset
|
207 |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
208 rifflen = muxer->file_end - vsi->riffofs[vsi->riffofspos] - 8; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
209 if (vsi->riffofspos == 0) { |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
210 rifflen += 8+muxer->idx_pos*sizeof(AVIINDEXENTRY); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
211 } |
12363 | 212 if (rifflen + paddedlen > ODML_CHUNKLEN && write_odml == 1) { |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
213 if (vsi->riffofspos == 0) { |
12363 | 214 avifile_write_standard_index(muxer); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
215 } |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
216 avifile_odml_new_riff(muxer); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
217 } |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
218 |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
219 if (vsi->riffofspos == 0) { |
12036 | 220 // add to the traditional index: |
221 if(muxer->idx_pos>=muxer->idx_size){ | |
222 muxer->idx_size+=256; // 4kB | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
223 muxer->idx=realloc_struct(muxer->idx,muxer->idx_size,16); |
12036 | 224 } |
225 muxer->idx[muxer->idx_pos].ckid=s->ckid; | |
226 muxer->idx[muxer->idx_pos].dwFlags=flags; // keyframe? | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
227 muxer->idx[muxer->idx_pos].dwChunkOffset=muxer->file_end-(muxer->movi_start-4); |
12036 | 228 muxer->idx[muxer->idx_pos].dwChunkLength=len; |
229 ++muxer->idx_pos; | |
230 } | |
231 | |
232 // add to odml index | |
233 if(si->idxpos>=si->idxsize){ | |
234 si->idxsize+=256; | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
235 si->idx=realloc_struct(si->idx,si->idxsize,sizeof(*si->idx)); |
2529 | 236 } |
12036 | 237 si->idx[si->idxpos].flags=(flags&AVIIF_KEYFRAME)?0:ODML_NOTKEYFRAME; |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
238 si->idx[si->idxpos].ofs=muxer->file_end; |
12036 | 239 si->idx[si->idxpos].len=len; |
240 ++si->idxpos; | |
241 | |
2529 | 242 // write out the chunk: |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
243 write_avi_chunk(muxer->file,s->ckid,len,s->buffer); /* unsigned char */ |
6918 | 244 |
12036 | 245 if (len > s->h.dwSuggestedBufferSize){ |
246 s->h.dwSuggestedBufferSize = len; | |
247 } | |
8585 | 248 if((unsigned int)len>s->h.dwSuggestedBufferSize) s->h.dwSuggestedBufferSize=len; |
1 | 249 |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
250 muxer->file_end += 8 + paddedlen; |
1 | 251 } |
252 | |
2529 | 253 static void write_avi_list(FILE *f,unsigned int id,int len){ |
1 | 254 unsigned int list_id=FOURCC_LIST; |
6918 | 255 int le_len; |
256 int le_id; | |
1 | 257 len+=4; // list fix |
6918 | 258 list_id = le2me_32(list_id); |
259 le_len = le2me_32(len); | |
260 le_id = le2me_32(id); | |
1 | 261 fwrite(&list_id,4,1,f); |
6918 | 262 fwrite(&le_len,4,1,f); |
263 fwrite(&le_id,4,1,f); | |
1 | 264 } |
265 | |
11374 | 266 #define WFSIZE(wf) (sizeof(WAVEFORMATEX)+(wf)->cbSize) |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2555
diff
changeset
|
267 |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
268 static void avifile_write_header(muxer_t *muxer){ |
8585 | 269 uint32_t riff[3]; |
12036 | 270 unsigned int dmlh[1]; |
8585 | 271 unsigned int i; |
2529 | 272 unsigned int hdrsize; |
8585 | 273 muxer_info_t info[16]; |
12036 | 274 FILE *f = muxer->file; |
275 VideoPropHeader vprp; | |
12061 | 276 uint32_t aspect = avi_aspect(muxer->def_v); |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
277 struct avi_stream_info *vsi = muxer->def_v->priv; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
278 int isodml = vsi->riffofspos > 0; |
12036 | 279 |
17065
cf6bfdf41143
Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents:
17023
diff
changeset
|
280 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader); |
12061 | 281 if (aspect == 0) { |
282 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: Aspect information not (yet?) available or unspecified, not writing vprp header.\n"); | |
283 } else { | |
284 mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: vprp aspect is %d:%d.\n", aspect >> 16, aspect & 0xffff); | |
285 } | |
286 | |
17648 | 287 /* deal with stream delays */ |
288 for (i = 0; muxer->streams[i] && i < MUXER_MAX_STREAMS; ++i) { | |
289 muxer_stream_t *s = muxer->streams[i]; | |
290 if (s->type == MUXER_TYPE_AUDIO && muxer->audio_delay_fix > 0.0) { | |
291 s->h.dwStart = muxer->audio_delay_fix * s->h.dwRate/s->h.dwScale; | |
292 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_SettingAudioDelay, (float)s->h.dwStart * s->h.dwScale/s->h.dwRate); | |
293 } | |
294 if (s->type == MUXER_TYPE_VIDEO && muxer->audio_delay_fix < 0.0) { | |
295 s->h.dwStart = -muxer->audio_delay_fix * s->h.dwRate/s->h.dwScale; | |
296 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_SettingVideoDelay, (float)s->h.dwStart * s->h.dwScale/s->h.dwRate); | |
297 } | |
298 } | |
299 | |
12036 | 300 if (isodml) { |
301 unsigned int rifflen, movilen; | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
302 int i; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
303 |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
304 vsi->riffofs[vsi->riffofspos+1] = muxer->file_end; |
12036 | 305 |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
306 /* fixup RIFF lengths */ |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
307 for (i=0; i<=vsi->riffofspos; i++) { |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
308 rifflen = vsi->riffofs[i+1] - vsi->riffofs[i] - 8; |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
309 movilen = le2me_32(rifflen - 12); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
310 rifflen = le2me_32(rifflen); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
311 fseeko(f, vsi->riffofs[i]+4, SEEK_SET); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
312 fwrite(&rifflen,4,1,f); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
313 |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
314 /* fixup movi length */ |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
315 if (i > 0) { |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
316 fseeko(f, vsi->riffofs[i]+16, SEEK_SET); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
317 fwrite(&movilen,4,1,f); |
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
318 } |
12036 | 319 } |
7145
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
320 |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
321 fseeko(f, 12, SEEK_SET); |
12036 | 322 } else { |
323 // RIFF header: | |
324 riff[0]=mmioFOURCC('R','I','F','F'); | |
325 riff[1]=muxer->file_end-2*sizeof(unsigned int); // filesize | |
326 riff[2]=formtypeAVI; // 'AVI ' | |
327 riff[0]=le2me_32(riff[0]); | |
328 riff[1]=le2me_32(riff[1]); | |
329 riff[2]=le2me_32(riff[2]); | |
330 fwrite(&riff,12,1,f); | |
331 } | |
332 | |
2529 | 333 // update AVI header: |
334 if(muxer->def_v){ | |
12036 | 335 int i; |
2529 | 336 muxer->avih.dwMicroSecPerFrame=1000000.0*muxer->def_v->h.dwScale/muxer->def_v->h.dwRate; |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2555
diff
changeset
|
337 // muxer->avih.dwMaxBytesPerSec=1000000; // dummy!!!!! FIXME |
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2555
diff
changeset
|
338 // muxer->avih.dwPaddingGranularity=2; // ??? |
2529 | 339 muxer->avih.dwFlags|=AVIF_ISINTERLEAVED|AVIF_TRUSTCKTYPE; |
12036 | 340 muxer->avih.dwTotalFrames=0; |
341 for (i=0; i<muxer->idx_pos; i++) { | |
342 if (muxer->idx[i].ckid == muxer->def_v->ckid) | |
343 muxer->avih.dwTotalFrames++; | |
344 } | |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2555
diff
changeset
|
345 // muxer->avih.dwSuggestedBufferSize=muxer->def_v->h.dwSuggestedBufferSize; |
2529 | 346 muxer->avih.dwWidth=muxer->def_v->bih->biWidth; |
347 muxer->avih.dwHeight=muxer->def_v->bih->biHeight; | |
348 } | |
349 | |
1 | 350 // AVI header: |
2529 | 351 hdrsize=sizeof(muxer->avih)+8; |
12036 | 352 if (isodml) hdrsize+=sizeof(dmlh)+20; // dmlh |
2529 | 353 // calc total header size: |
354 for(i=0;i<muxer->avih.dwStreams;i++){ | |
12036 | 355 muxer_stream_t *s = muxer->streams[i]; |
356 struct avi_stream_info *si = s->priv; | |
357 | |
2529 | 358 hdrsize+=12; // LIST |
359 hdrsize+=sizeof(muxer->streams[i]->h)+8; // strh | |
360 switch(muxer->streams[i]->type){ | |
8585 | 361 case MUXER_TYPE_VIDEO: |
2529 | 362 hdrsize+=muxer->streams[i]->bih->biSize+8; // strf |
12061 | 363 if (aspect != 0) { |
12051 | 364 hdrsize+=8+4*(9+8*1); // vprp |
365 } | |
2529 | 366 break; |
8585 | 367 case MUXER_TYPE_AUDIO: |
2635
c1e24e01601b
fixed AVI header creation - now should be compatible with NaNdub
arpi
parents:
2555
diff
changeset
|
368 hdrsize+=WFSIZE(muxer->streams[i]->wf)+8; // strf |
2529 | 369 break; |
370 } | |
12036 | 371 if (isodml && si && si->superidx && si->superidxsize) { |
372 hdrsize += 32 + 16*si->superidxsize; //indx | |
373 } | |
2529 | 374 } |
375 write_avi_list(f,listtypeAVIHEADER,hdrsize); | |
6918 | 376 |
377 le2me_MainAVIHeader(&muxer->avih); | |
378 write_avi_chunk(f,ckidAVIMAINHDR,sizeof(muxer->avih),&muxer->avih); /* MainAVIHeader */ | |
379 le2me_MainAVIHeader(&muxer->avih); | |
2529 | 380 |
381 // stream headers: | |
382 for(i=0;i<muxer->avih.dwStreams;i++){ | |
12036 | 383 muxer_stream_t *s = muxer->streams[i]; |
384 struct avi_stream_info *si = s->priv; | |
385 unsigned int idxhdr[8]; | |
386 int j,n; | |
387 | |
388 hdrsize=sizeof(s->h)+8; // strh | |
389 if (si && si->superidx && si->superidxsize) { | |
390 hdrsize += 32 + 16*si->superidxsize; //indx | |
391 } | |
392 switch(s->type){ | |
8585 | 393 case MUXER_TYPE_VIDEO: |
12036 | 394 hdrsize+=s->bih->biSize+8; // strf |
395 s->h.fccHandler = s->bih->biCompression; | |
396 s->h.rcFrame.right = s->bih->biWidth; | |
397 s->h.rcFrame.bottom = s->bih->biHeight; | |
12061 | 398 if (aspect != 0) { |
12051 | 399 // fill out vprp info |
400 memset(&vprp, 0, sizeof(vprp)); | |
401 vprp.dwVerticalRefreshRate = (s->h.dwRate+s->h.dwScale-1)/s->h.dwScale; | |
402 vprp.dwHTotalInT = muxer->avih.dwWidth; | |
403 vprp.dwVTotalInLines = muxer->avih.dwHeight; | |
12061 | 404 vprp.dwFrameAspectRatio = aspect; |
12051 | 405 vprp.dwFrameWidthInPixels = muxer->avih.dwWidth; |
406 vprp.dwFrameHeightInLines = muxer->avih.dwHeight; | |
407 vprp.nbFieldPerFrame = 1; | |
408 vprp.FieldInfo[0].CompressedBMHeight = muxer->avih.dwHeight; | |
409 vprp.FieldInfo[0].CompressedBMWidth = muxer->avih.dwWidth; | |
410 vprp.FieldInfo[0].ValidBMHeight = muxer->avih.dwHeight; | |
411 vprp.FieldInfo[0].ValidBMWidth = muxer->avih.dwWidth; | |
412 hdrsize+=8+4*(9+8*1); // vprp | |
413 } | |
2529 | 414 break; |
8585 | 415 case MUXER_TYPE_AUDIO: |
12036 | 416 hdrsize+=WFSIZE(s->wf)+8; // strf |
417 s->h.fccHandler = s->wf->wFormatTag; | |
2529 | 418 break; |
419 } | |
12036 | 420 |
2529 | 421 write_avi_list(f,listtypeSTREAMHEADER,hdrsize); |
12036 | 422 le2me_AVIStreamHeader(&s->h); |
423 write_avi_chunk(f,ckidSTREAMHEADER,sizeof(s->h),&s->h); /* AVISTreamHeader */ // strh | |
424 le2me_AVIStreamHeader(&s->h); | |
6918 | 425 |
12036 | 426 switch(s->type){ |
8585 | 427 case MUXER_TYPE_VIDEO: |
6918 | 428 { |
12036 | 429 int biSize=s->bih->biSize; |
430 le2me_BITMAPINFOHEADER(s->bih); | |
431 write_avi_chunk(f,ckidSTREAMFORMAT,biSize,s->bih); /* BITMAPINFOHEADER */ | |
12053 | 432 le2me_BITMAPINFOHEADER(s->bih); |
433 | |
12061 | 434 if (aspect != 0) { |
12053 | 435 int fields = vprp.nbFieldPerFrame; |
12051 | 436 le2me_VideoPropHeader(&vprp); |
437 le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[0]); | |
438 le2me_VIDEO_FIELD_DESC(&vprp.FieldInfo[1]); | |
439 write_avi_chunk(f,mmioFOURCC('v','p','r','p'), | |
12053 | 440 sizeof(VideoPropHeader) - |
441 sizeof(VIDEO_FIELD_DESC)*(2-fields), | |
442 &vprp); /* Video Properties Header */ | |
12051 | 443 } |
6918 | 444 } |
2529 | 445 break; |
8585 | 446 case MUXER_TYPE_AUDIO: |
6918 | 447 { |
12036 | 448 int wfsize = WFSIZE(s->wf); |
449 le2me_WAVEFORMATEX(s->wf); | |
450 write_avi_chunk(f,ckidSTREAMFORMAT,wfsize,s->wf); /* WAVEFORMATEX */ | |
451 le2me_WAVEFORMATEX(s->wf); | |
6918 | 452 } |
2529 | 453 break; |
454 } | |
12036 | 455 if (isodml && si && si->superidx && si->superidxsize) { |
456 n = si->superidxsize; | |
457 | |
458 idxhdr[0] = le2me_32(mmioFOURCC('i', 'n', 'd', 'x')); | |
459 idxhdr[1] = le2me_32(24 + 16*n); | |
460 idxhdr[2] = le2me_32(0x00000004); | |
461 idxhdr[3] = le2me_32(si->superidxpos); | |
462 idxhdr[4] = le2me_32(s->ckid); | |
463 idxhdr[5] = 0; | |
464 idxhdr[6] = 0; | |
465 idxhdr[7] = 0; | |
466 | |
467 fwrite(idxhdr,sizeof(idxhdr),1,f); | |
468 for (j=0; j<n; j++) { | |
469 struct avi_odmlsuperidx_entry *entry = &si->superidx[j]; | |
470 unsigned int data[4]; | |
471 data[0] = le2me_32(entry->ofs); | |
472 data[1] = le2me_32(entry->ofs >> 32); | |
473 data[2] = le2me_32(entry->len); | |
474 data[3] = le2me_32(entry->duration); | |
475 fwrite(data,sizeof(data),1,f); | |
476 } | |
477 } | |
478 } | |
479 | |
480 // ODML | |
481 if (isodml) { | |
482 memset(dmlh, 0, sizeof(dmlh)); | |
483 dmlh[0] = le2me_32(muxer->avih.dwTotalFrames); | |
484 write_avi_list(f,mmioFOURCC('o','d','m','l'),sizeof(dmlh)+8); | |
485 write_avi_chunk(f,mmioFOURCC('d','m','l','h'),sizeof(dmlh),dmlh); | |
2529 | 486 } |
487 | |
7145
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
488 // ============= INFO =============== |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
489 // always include software info |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
490 info[0].id=mmioFOURCC('I','S','F','T'); // Software: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
491 info[0].text="MEncoder " VERSION; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
492 // include any optional strings |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
493 i=1; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
494 if(info_name!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
495 info[i].id=mmioFOURCC('I','N','A','M'); // Name: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
496 info[i++].text=info_name; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
497 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
498 if(info_artist!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
499 info[i].id=mmioFOURCC('I','A','R','T'); // Artist: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
500 info[i++].text=info_artist; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
501 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
502 if(info_genre!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
503 info[i].id=mmioFOURCC('I','G','N','R'); // Genre: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
504 info[i++].text=info_genre; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
505 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
506 if(info_subject!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
507 info[i].id=mmioFOURCC('I','S','B','J'); // Subject: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
508 info[i++].text=info_subject; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
509 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
510 if(info_copyright!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
511 info[i].id=mmioFOURCC('I','C','O','P'); // Copyright: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
512 info[i++].text=info_copyright; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
513 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
514 if(info_sourceform!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
515 info[i].id=mmioFOURCC('I','S','R','F'); // Source Form: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
516 info[i++].text=info_sourceform; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
517 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
518 if(info_comment!=NULL){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
519 info[i].id=mmioFOURCC('I','C','M','T'); // Comment: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
520 info[i++].text=info_comment; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
521 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
522 info[i].id=0; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
523 |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
524 hdrsize=0; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
525 // calc info size: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
526 for(i=0;info[i].id!=0;i++) if(info[i].text){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
527 size_t sz=strlen(info[i].text)+1; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
528 hdrsize+=sz+8+sz%2; |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
529 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
530 // write infos: |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
531 if (hdrsize!=0){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
532 write_avi_list(f,mmioFOURCC('I','N','F','O'),hdrsize); |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
533 for(i=0;info[i].id!=0;i++) if(info[i].text){ |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
534 write_avi_chunk(f,info[i].id,strlen(info[i].text)+1,info[i].text); |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
535 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
536 } |
3854945aefbb
new mencoder option -info, to store copyright, title, encoder version etc in AVI
arpi
parents:
7144
diff
changeset
|
537 |
2529 | 538 // JUNK: |
12036 | 539 write_avi_chunk(f,ckidAVIPADDING,MOVIALIGN-(ftello(f)%MOVIALIGN)-8,NULL); /* junk */ |
540 if (!isodml) { | |
541 // 'movi' header: | |
542 write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12); | |
543 } else { | |
544 if (ftello(f) != MOVIALIGN) { | |
545 mp_msg(MSGT_MUXER, MSGL_ERR, "Opendml superindex is too big for reserved space!\n"); | |
17366 | 546 mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %ld, missing space %ld\n", MOVIALIGN, ftell(muxer->file), ftell(muxer->file)-MOVIALIGN); |
12037 | 547 mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n"); |
12036 | 548 } |
549 write_avi_list(f,listtypeAVIMOVIE,muxer->movi_end-ftello(f)-12); | |
550 } | |
551 muxer->movi_start=ftello(muxer->file); | |
12235
ca5dc9c2cb51
Get rid of the 'RIFF chunks have to be aligned on ODML_CHUNKLEN'
ranma
parents:
12062
diff
changeset
|
552 if (muxer->file_end == 0) muxer->file_end = ftello(muxer->file); |
12036 | 553 } |
554 | |
555 static void avifile_odml_write_index(muxer_t *muxer){ | |
556 muxer_stream_t* s; | |
557 struct avi_stream_info *si; | |
558 int i; | |
559 | |
560 for (i=0; i<muxer->avih.dwStreams; i++) { | |
561 int j,k,n,idxpos,len,last,entries_per_subidx; | |
562 unsigned int idxhdr[8]; | |
563 s = muxer->streams[i]; | |
564 si = s->priv; | |
565 | |
566 /* | |
567 * According to Avery Lee MSMP wants the subidx chunks to have the same size. | |
568 * | |
569 * So this code figures out how many entries we can put into | |
570 * an ix?? chunk, so that each ix?? chunk has the same size and the offsets | |
571 * don't overflow (Using ODML_CHUNKLEN for that is a bit more restrictive | |
572 * than it has to be though). | |
573 */ | |
574 | |
575 len = 0; | |
576 n = 0; | |
577 entries_per_subidx = INT_MAX; | |
578 do { | |
579 off_t start = si->idx[0].ofs; | |
580 last = entries_per_subidx; | |
581 for (j=0; j<si->idxpos; j++) { | |
582 len = si->idx[j].ofs - start; | |
583 if(len >= ODML_CHUNKLEN || n >= entries_per_subidx) { | |
584 if (entries_per_subidx > n) { | |
585 entries_per_subidx = n; | |
586 } | |
587 start = si->idx[j].ofs; | |
588 len = 0; | |
589 n = 0; | |
590 } | |
591 n++; | |
592 } | |
593 } while (last != entries_per_subidx); | |
594 | |
595 si->superidxpos = (si->idxpos+entries_per_subidx-1) / entries_per_subidx; | |
596 | |
597 mp_msg(MSGT_MUXER, MSGL_V, "ODML: Stream %d: Using %d entries per subidx, %d entries in superidx\n", | |
598 i, entries_per_subidx, si->superidxpos); | |
599 | |
600 si->superidxsize = si->superidxpos; | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
17659
diff
changeset
|
601 si->superidx = calloc(si->superidxsize, sizeof(*si->superidx)); |
12036 | 602 memset(si->superidx, 0, sizeof(*si->superidx) * si->superidxsize); |
603 | |
604 idxpos = 0; | |
605 for (j=0; j<si->superidxpos; j++) { | |
606 off_t start = si->idx[idxpos].ofs; | |
607 int duration; | |
608 | |
609 duration = 0; | |
610 for (k=0; k<entries_per_subidx && idxpos+k<si->idxpos; k++) { | |
611 duration += s->h.dwSampleSize ? si->idx[idxpos+k].len/s->h.dwSampleSize : 1; | |
612 } | |
613 | |
614 idxhdr[0] = le2me_32((s->ckid << 16) | mmioFOURCC('i', 'x', 0, 0)); | |
615 idxhdr[1] = le2me_32(24 + 8*k); | |
616 idxhdr[2] = le2me_32(0x01000002); | |
617 idxhdr[3] = le2me_32(k); | |
618 idxhdr[4] = le2me_32(s->ckid); | |
619 idxhdr[5] = le2me_32(start + 8); | |
620 idxhdr[6] = le2me_32((start + 8)>> 32); | |
621 idxhdr[7] = 0; /* unused */ | |
622 | |
623 si->superidx[j].len = 32 + 8*k; | |
624 si->superidx[j].ofs = ftello(muxer->file); | |
625 si->superidx[j].duration = duration; | |
626 | |
627 fwrite(idxhdr,sizeof(idxhdr),1,muxer->file); | |
628 for (k=0; k<entries_per_subidx && idxpos<si->idxpos; k++) { | |
629 unsigned int entry[2]; | |
630 entry[0] = le2me_32(si->idx[idxpos].ofs - start); | |
631 entry[1] = le2me_32(si->idx[idxpos].len | si->idx[idxpos].flags); | |
632 idxpos++; | |
633 fwrite(entry,sizeof(entry),1,muxer->file); | |
634 } | |
635 } | |
636 } | |
637 muxer->file_end=ftello(muxer->file); | |
1 | 638 } |
639 | |
12363 | 640 static void avifile_write_standard_index(muxer_t *muxer){ |
12036 | 641 |
642 muxer->movi_end=ftello(muxer->file); | |
2529 | 643 if(muxer->idx && muxer->idx_pos>0){ |
6918 | 644 int i; |
2529 | 645 // fixup index entries: |
646 // for(i=0;i<muxer->idx_pos;i++) muxer->idx[i].dwChunkOffset-=muxer->movi_start-4; | |
647 // write index chunk: | |
6918 | 648 for (i=0; i<muxer->idx_pos; i++) le2me_AVIINDEXENTRY((&muxer->idx[i])); |
9007
12fc55eb3373
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
arpi
parents:
8591
diff
changeset
|
649 write_avi_chunk(muxer->file,ckidAVINEWINDEX,16*muxer->idx_pos,muxer->idx); /* AVIINDEXENTRY */ |
6918 | 650 for (i=0; i<muxer->idx_pos; i++) le2me_AVIINDEXENTRY((&muxer->idx[i])); |
2529 | 651 muxer->avih.dwFlags|=AVIF_HASINDEX; |
652 } | |
12036 | 653 muxer->file_end=ftello(muxer->file); |
1 | 654 } |
655 | |
12363 | 656 static void avifile_write_index(muxer_t *muxer){ |
657 struct avi_stream_info *vsi = muxer->def_v->priv; | |
658 | |
17065
cf6bfdf41143
Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
reynaldo
parents:
17023
diff
changeset
|
659 mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer); |
12363 | 660 if (vsi->riffofspos > 0){ |
661 avifile_odml_write_index(muxer); | |
662 } else { | |
663 avifile_write_standard_index(muxer); | |
664 } | |
665 } | |
666 | |
17659 | 667 static void avifile_fix_parameters(muxer_stream_t *s){ |
668 /* adjust audio_delay_fix according to individual stream delay */ | |
669 if (s->type == MUXER_TYPE_AUDIO) | |
670 s->muxer->audio_delay_fix -= (float)s->decoder_delay * s->h.dwScale/s->h.dwRate; | |
671 if (s->type == MUXER_TYPE_VIDEO) | |
672 s->muxer->audio_delay_fix += (float)s->decoder_delay * s->h.dwScale/s->h.dwRate; | |
673 } | |
674 | |
14753
70c446099f40
new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
nicodvb
parents:
13250
diff
changeset
|
675 int muxer_init_muxer_avi(muxer_t *muxer){ |
8585 | 676 muxer->cont_new_stream = &avifile_new_stream; |
677 muxer->cont_write_chunk = &avifile_write_chunk; | |
678 muxer->cont_write_header = &avifile_write_header; | |
679 muxer->cont_write_index = &avifile_write_index; | |
17659 | 680 muxer->fix_stream_parameters = &avifile_fix_parameters; |
14753
70c446099f40
new mpeg muxer compatible with dvd/[s]vcd; small changes in the muxer layer (sanity checks in the muxer_init functions)
nicodvb
parents:
13250
diff
changeset
|
681 return 1; |
8585 | 682 } |