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