Mercurial > mplayer.hg
annotate DOCS/tech/mpcf.txt @ 13800:75644a19873b
ffmpeg mjpeg-b is working
author | rtognimp |
---|---|
date | Fri, 29 Oct 2004 20:48:13 +0000 |
parents | 8ff17d153414 |
children | 6cdd5669e930 |
rev | line source |
---|---|
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
1 NUT Open Container Format DRAFT 20040911 |
10817 | 2 ---------------------------------------- |
9294 | 3 |
4 | |
5 | |
6 Intro: | |
7 | |
8 Features / goals: | |
9 (supported by the format, not necessary by a specific implementation) | |
10 | |
11 Simple | |
12 use the same encoding for nearly all fields | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
13 simple decoding, so slow cpus (and embedded systems) can handle it |
9294 | 14 Extendible |
15 no limit for the possible values for all fields (using universal vlc) | |
16 allow adding of new headers in the future | |
17 allow adding more fields at the end of headers | |
18 Compact | |
19 ~0.2% overhead, for normal bitrates | |
20 index is <10kb per hour (1 keyframe every 3sec) | |
10831 | 21 a usual header for a file is about 100bytes (audio + video headers together) |
12082 | 22 a packet header is about ~1-8 bytes |
9294 | 23 Error resistant |
24 seeking / playback without an index | |
25 headers & index can be repeated | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
26 damaged files can be played back with minimal data lost and fast |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
27 resyncing times |
9294 | 28 |
29 | |
30 | |
31 Definitions: | |
32 | |
33 MUST the specific part must be done to conform to this standard | |
34 SHOULD its recommanded to be done that way but its not strictly required | |
35 | |
36 | |
37 | |
38 Syntax: | |
39 | |
9295 | 40 Type definitions: |
12209 | 41 |
13047 | 42 f(x) n fixed bits in big-endian order |
12209 | 43 u(x) unsigned number encoded in x bits in MSB first order |
44 | |
9295 | 45 v |
46 value=0 | |
47 do{ | |
48 more_data u(1) | |
49 data u(7) | |
50 value= 128*value + data | |
51 }while(more_data) | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
52 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
53 s |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
54 temp v |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
55 temp++ |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
56 if(temp&1) value= -(temp>>1) |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
57 else value= (temp>>1) |
9323 | 58 |
59 b (binary data or string) | |
60 for(i=0; i<length; i++){ | |
61 data[i] u(8) | |
9295 | 62 } |
9335
de287fe94511
lang & country codes from ISO & utf8 requirement (ideas from Tobias Diedrich <td at sim dot uni-hannover dot de>
michael
parents:
9325
diff
changeset
|
63 Note: strings MUST be encoded in utf8 |
9295 | 64 |
12117 | 65 vb |
66 length v | |
67 value b | |
68 | |
9295 | 69 |
70 Bitstream syntax: | |
9294 | 71 packet header |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
72 forward ptr v |
9294 | 73 |
74 align_byte | |
75 while(not byte aligned) | |
76 one f(1) | |
77 | |
78 reserved_bytes | |
79 for(i=0; i<forward_ptr - length_of_non_reserved; i++) | |
80 reserved u(8) | |
12184 | 81 a demuxer MUST ignore any reserved bytes |
82 a muxer MUST NOT write any reserved bytes, as this would make it | |
10824 | 83 inpossible to add new fields at the end of packets in the future in |
84 a compatible way | |
85 | |
9294 | 86 main header: |
10831 | 87 main_startcode f(64) |
9294 | 88 packet header |
89 version v | |
90 stream_count v | |
12333 | 91 max_distance v |
12501 | 92 max_short_distance v |
12413 | 93 global_time_base_nom v |
94 global_time_base_denom v | |
95 short_startcode v | |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
96 for(i=0; i<256; ){ |
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
97 tmp_flag v |
12428 | 98 tmp_fields v |
99 if(tmp_fields>0) tmp_timestamp s | |
100 if(tmp_fields>1) tmp_mul v | |
101 if(tmp_fields>2) tmp_stream v | |
102 if(tmp_fields>3) tmp_size v | |
103 else tmp_size=0 | |
104 if(tmp_fields>4) tmp_res v | |
105 else tmp_res=0 | |
106 if(tmp_fields>5) count v | |
107 else count= tmp_mul - tmp_size | |
108 for(j=6; j<tmp_fields; j++){ | |
109 tmp_reserved[i] v | |
110 } | |
111 for(j=0; j<count && i<256; j++, i++){ | |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
112 flags[i]= tmp_flag; |
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
113 stream_id_plus1[i]= tmp_stream; |
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
114 data_size_mul[i]= tmp_mul; |
12428 | 115 data_size_lsb[i]= tmp_size + j; |
12413 | 116 timestamp_delta[i]= tmp_timestamp; |
12501 | 117 reserved_count[i]= tmp_res; |
12082 | 118 } |
119 } | |
9294 | 120 reserved_bytes |
121 checksum u(32) | |
122 | |
123 stream_header: | |
10831 | 124 stream_startcode f(64) |
9294 | 125 packet_header |
126 stream_id v | |
127 stream_class v | |
12150 | 128 fourcc vb |
9294 | 129 average_bitrate v |
9297 | 130 time_base_nom v |
131 time_base_denom v | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
132 msb_timestamp_shift v |
12333 | 133 decode_delay v |
9294 | 134 fixed_fps u(1) |
9356 | 135 reserved u(6) |
9357
21347f49e8d8
supprting various codec specific/private headers for different APIs (ideas by arpi/alex/fabian)
michael
parents:
9356
diff
changeset
|
136 for(;;){ |
9361 | 137 codec_specific_data_type v |
138 if(codec_specific_data_type==0) break; | |
12117 | 139 codec_specific_data vb |
9357
21347f49e8d8
supprting various codec specific/private headers for different APIs (ideas by arpi/alex/fabian)
michael
parents:
9356
diff
changeset
|
140 } |
9294 | 141 |
142 video_stream_header: | |
143 stream_header | |
144 width v | |
145 height v | |
146 sample_width v | |
147 sample_height v | |
148 colorspace_type v | |
149 reserved_bytes | |
150 checksum u(32) | |
151 | |
152 audio_stream_header: | |
153 stream_header | |
12333 | 154 samplerate_nom v |
155 samplerate_denom v | |
9294 | 156 channel_count v |
157 reserved_bytes | |
158 checksum u(32) | |
9420 | 159 |
12082 | 160 |
9294 | 161 frame |
12082 | 162 frame_code f(8) |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
163 if(stream_id_plus1[frame_code]==0){ |
12082 | 164 stream_id v |
165 } | |
12413 | 166 if(timestamp_delta[frame_code]==0){ |
12261 | 167 coded_timestamp v |
168 } | |
12413 | 169 if(flags[frame_code]&1){ |
12082 | 170 data_size_msb v |
171 } | |
12501 | 172 for(i=0; i<reserved_count[frame_code]; i++) |
12413 | 173 reserved v |
12082 | 174 data |
175 | |
9294 | 176 Index: |
10831 | 177 index_startcode f(64) |
9294 | 178 packet header |
179 index_length v | |
180 for(i=0; i<index_length; i++){ | |
181 index_timestamp v | |
182 index_position v | |
183 } | |
9310 | 184 reserved_bytes |
9294 | 185 checksum u(32) |
186 | |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
187 info_packet: (optional) (file global) |
10831 | 188 info_startcode f(64) |
9294 | 189 packet header |
9323 | 190 for(;;){ |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
191 id v |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
192 if(id==0) break |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
193 name= info_table[id][0] |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
194 type= info_table[id][1] |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
195 if(type==NULL) |
12117 | 196 type vb |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
197 if(name==NULL) |
12117 | 198 name vb |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
199 if(type=="v") |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
200 value v |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
201 else |
12117 | 202 value vb |
9323 | 203 } |
9310 | 204 reserved_bytes |
9294 | 205 checksum u(32) |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
206 |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
207 meta_packet: (optional) (stream specific) |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
208 meta_startcode f(64) |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
209 packet header |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
210 stream_id v |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
211 for(;;){ |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
212 id v |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
213 if(id==0) break |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
214 name= meta_table[id][0] |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
215 type= meta_table[id][1] |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
216 if(type==NULL) |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
217 type vb |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
218 if(name==NULL) |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
219 name vb |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
220 if(type=="v") |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
221 value v |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
222 else |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
223 value vb |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
224 } |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
225 reserved_bytes |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
226 checksum u(32) |
9323 | 227 |
12413 | 228 sync_point |
229 frame_startcode f(64) | |
230 global_timestamp v | |
231 | |
12242 | 232 file |
233 file_id_string | |
12502 | 234 while(!eof && next_code != index_startcode){ |
12242 | 235 main_header |
236 for(i=0; i<stream_count; i++){ | |
237 if(next_packet==video_stream_header) | |
238 video_stream_header | |
239 else | |
240 audio_stream_header | |
241 } | |
12413 | 242 while(next_code != main_startcode){ |
243 if(next_code == info_startcode) | |
12242 | 244 info_packet |
12368 | 245 else{ |
12413 | 246 if(next_code == short_startcode) |
247 short_startcode u(24) | |
248 else if(next_code == frame_startcode) | |
249 sync_point | |
12242 | 250 frame |
12368 | 251 } |
12242 | 252 } |
253 } | |
12502 | 254 index |
9323 | 255 |
9294 | 256 forward_ptr |
12238 | 257 size of the packet (exactly the distance from the first byte of the |
258 startcode of the current packet to the first byte of the following packet | |
12242 | 259 |
260 file_id_string | |
261 "nut/multimedia container\0" | |
9323 | 262 |
263 *_startcode | |
12162 | 264 all startcodes start with 'N' |
265 | |
266 main_startcode | |
267 0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48) | |
268 stream_starcode | |
269 0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48) | |
12333 | 270 frame_startcode |
12162 | 271 0xE4ADEECA4569ULL + (((uint64_t)('N'<<8) + 'K')<<48) |
12392 | 272 frame_startcodes SHOULD be placed immedeatly before a keyframe if the |
273 previous frame of the same stream was a non-keyframe, unless such | |
274 non-keyframe - keyframe tansitions are very frequent | |
12365
dc05db3f172f
additional start_code rule (implemenattion does this since a long time already)
michael
parents:
12333
diff
changeset
|
275 |
12162 | 276 index_startcode |
277 0xDD672F23E64EULL + (((uint64_t)('N'<<8) + 'X')<<48) | |
278 info_startcode | |
279 0xAB68B596BA78ULL + (((uint64_t)('N'<<8) + 'I')<<48) | |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
280 meta_startcode |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
281 FIXME |
9294 | 282 |
283 version | |
12238 | 284 2 for now |
285 | |
12333 | 286 max_distance |
287 max distance of frame_startcodes, the distance may only be larger if | |
288 there is only a single frame between the 2 frame_startcodes | |
289 this can be used by the demuxer to detect damaged frame headers if the | |
290 damage results in a too long chain | |
12501 | 291 SHOULD be set to <=32768 or at least <=65536 unless there is a very good |
292 reason to set it higher otherwise reasonable error recovery will be | |
293 impossible | |
294 | |
295 max_short_distance | |
296 max distance of short startcodes or frame_startcodes, the distance may | |
297 only be larger if there is only a single frame between the 2 | |
298 frame_startcodes/short startcodes this can be used by the demuxer to | |
299 detect damaged frame headers if the damage results in a too long chain | |
300 SHOULD be set to <=4096 or at least <=8192 unless there is a very good | |
301 reason to set it higher otherwise reasonable error recovery will be | |
302 impossible | |
303 | |
12238 | 304 |
12413 | 305 short_startcode |
306 MUST be 3 bytes long and MUST have 'N' as first byte, the second byte | |
307 MUST not be a printable uppercase letter / must not be within 65..90, | |
308 default is 0x4EFE79 | |
12501 | 309 |
9294 | 310 stream_id |
311 Note: streams with a lower relative class MUST have a lower relative id | |
312 so a stream with class 0 MUST allways have a id which is lower then any | |
313 stream with class > 0 | |
12150 | 314 stream_id MUST be < stream_count |
9294 | 315 |
316 stream_class | |
317 0 video | |
318 32 audio | |
319 64 subtiles | |
320 Note the remaining values are reserved and MUST NOT be used | |
12184 | 321 a demuxer MUST ignore streams with reserved classes |
9294 | 322 |
323 fourcc | |
324 identification for the codec | |
9323 | 325 example: "H264" |
10817 | 326 MUST contain 2 or 4 bytes, note, this might be increased in the future |
327 if needed | |
328 | |
9294 | 329 language_code |
9335
de287fe94511
lang & country codes from ISO & utf8 requirement (ideas from Tobias Diedrich <td at sim dot uni-hannover dot de>
michael
parents:
9325
diff
changeset
|
330 ISO 639 and ISO 3166 for language/country code |
9325 | 331 something like "usen" (US english), can be 0 |
9294 | 332 if unknown |
9335
de287fe94511
lang & country codes from ISO & utf8 requirement (ideas from Tobias Diedrich <td at sim dot uni-hannover dot de>
michael
parents:
9325
diff
changeset
|
333 see http://www.loc.gov/standards/iso639-2/englangn.html |
de287fe94511
lang & country codes from ISO & utf8 requirement (ideas from Tobias Diedrich <td at sim dot uni-hannover dot de>
michael
parents:
9325
diff
changeset
|
334 and http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html |
9294 | 335 |
9297 | 336 time_base_nom / time_base_denom = time_base |
9294 | 337 the number of timer ticks per second, this MUST be equal to the fps |
338 if the fixed_fps is 1 | |
9297 | 339 time_base_denom MUST not be 0 |
340 time_base_nom and time_base_denom MUST be relative prime | |
12254 | 341 time_base_nom MUST be < 2^31 |
9297 | 342 examples: |
343 fps time_base_nom time_base_denom | |
344 30 30 1 | |
345 29.97 30000 1001 | |
346 23.976 24000 1001 | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
347 sample_rate sample_rate_mul time_base_nom time_base_denom |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
348 44100 1 44100 1 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
349 44100 64 11025 16 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
350 48000 1024 375 8 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
351 Note: the advantage to using a large sample_rate_mul is that the |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
352 timestamps need fewer bits |
9294 | 353 |
12413 | 354 global_time_base_nom / global_time_base_denom = global_time_base |
355 the number of timer ticks per second | |
356 global_time_base_denom MUST not be 0 | |
357 global_time_base_nom and global_time_base_denom MUST be relative prime | |
358 global_time_base_nom MUST be < 2^31 | |
359 | |
360 global_timestamp | |
361 timestamp in global_time_base units | |
362 when a global_timestamp is encountered the last_timestamp of all streams | |
363 is set to the following: | |
364 ln= global_time_base_denom*time_base_nom | |
365 sn= global_timestamp | |
366 d1= global_time_base_nom | |
367 d2= time_base_denom | |
368 last_timestamp= (ln/d1*sn + ln%d1*sn/d1)/d2 | |
369 Note, this calculation MUST be done with unsigned 64 bit integers, and | |
370 is equivalent to (ln*sn)/(d1*d2) but this would require a 96bit integer | |
371 | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
372 msb_timestamp_shift |
12261 | 373 amount of bits in lsb_timestamp |
9294 | 374 MUST be <16 |
375 | |
12333 | 376 decode_delay |
377 maximum time between input and output for a codec, used to generate dts | |
378 from pts | |
379 is 0 for streams without b frames, and 1 for streams with b frames, may | |
380 be larger for future codecs | |
381 | |
9294 | 382 fixed_fps |
383 1 indicates that the fps is fixed | |
384 | |
9357
21347f49e8d8
supprting various codec specific/private headers for different APIs (ideas by arpi/alex/fabian)
michael
parents:
9356
diff
changeset
|
385 codec_specific_data_type |
10817 | 386 0 none/end |
9361 | 387 1 native |
388 2 bitmapinfoheader | |
389 3 waveformatex | |
390 4 imagedesc | |
391 5 sounddesc | |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
392 "native", means a simple api & container independent storage form, |
9357
21347f49e8d8
supprting various codec specific/private headers for different APIs (ideas by arpi/alex/fabian)
michael
parents:
9356
diff
changeset
|
393 for example some mpeg4-es headers |
21347f49e8d8
supprting various codec specific/private headers for different APIs (ideas by arpi/alex/fabian)
michael
parents:
9356
diff
changeset
|
394 |
9356 | 395 codec_specific_data |
396 private global data for a codec (could be huffman tables or ...) | |
12082 | 397 |
398 frame_code | |
399 the meaning of this byte is stored in the main header | |
400 the value 78 ('N') is forbidden to ensure that the byte is always | |
401 different from the first byte of any startcode | |
9420 | 402 |
12082 | 403 flags[frame_code] |
12413 | 404 the bits of the flags from MSB to LSB are KD |
12261 | 405 if D is 1 then data_size_msb is coded, otherwise data_size_msb is 0 |
12238 | 406 K is the keyframe_type |
407 0-> no keyframe, | |
408 1-> keyframe, | |
12413 | 409 flags=4 can be used to mark illegal frame_code bytes |
410 frame_code=78 must have flags=4 | |
12333 | 411 * frames MUST not depend(1) upon frames prior to the last |
412 frame_startcode | |
12110
a34dc5a369ca
restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents:
12084
diff
changeset
|
413 depend(1) means dependancy on the container level (NUT) not dependancy |
a34dc5a369ca
restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents:
12084
diff
changeset
|
414 on the codec level |
a34dc5a369ca
restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents:
12084
diff
changeset
|
415 |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
416 stream_id_plus1[frame_code] |
12082 | 417 must be <250 |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
418 if its 0 then the stream_id is coded in the frame |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
419 |
12082 | 420 data_size_mul[frame_code] |
12379
4100528fadf1
limits too small, my CBR mp3 samples have 2x overhead after removial of size prediction
michael
parents:
12368
diff
changeset
|
421 must be <16384 |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
422 |
12082 | 423 data_size_lsb[frame_code] |
12379
4100528fadf1
limits too small, my CBR mp3 samples have 2x overhead after removial of size prediction
michael
parents:
12368
diff
changeset
|
424 must be <16384 |
12082 | 425 |
12413 | 426 timestamp_delta[frame_code] |
427 must be <16384 and >-16384 | |
428 | |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
429 data_size |
12261 | 430 data_size= data_size_lsb + data_size_msb*data_size_mul; |
12082 | 431 |
12261 | 432 coded_timestamp |
433 if coded_timestamp < (1<<msb_timestamp_shift) then its a | |
434 lsb timestamp, otherwise its a full timestamp + (1<<msb_timestamp_shift) | |
435 lsb timestamps are converted to full timesamps by: | |
436 mask = (1<<msb_timestamp_shift)-1; | |
437 delta= last_timestamp - mask/2 | |
438 timestamp= ((timestamp_lsb-delta)&mask) + delta | |
12333 | 439 a full timestamp must be used if there is no reference timestamp |
440 available after the last frame_startcode with the current stream_id | |
12261 | 441 |
9294 | 442 lsb_timestamp |
12082 | 443 least significant bits of the timestamp in time_base precission |
9294 | 444 Example: IBBP display order |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
445 keyframe timestamp=0 -> timestamp=0 |
9294 | 446 frame lsb_timestamp=3 -> timestamp=3 |
447 frame lsb_timestamp=1 -> timestamp=1 | |
448 frame lsb_timestamp=2 -> timestamp=2 | |
449 ... | |
12084
68baf8877c07
reversing the change to the forw/backw pointers, its somewhat simpler to update it if the forward pointer is first
michael
parents:
12082
diff
changeset
|
450 keyframe msb_timestamp=257 -> timestamp=257 |
12082 | 451 frame lsb_timestamp=255->timestamp=255 |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
452 frame lsb_timestamp=0 -> timestamp=256 |
9294 | 453 frame lsb_timestamp=4 -> timestamp=260 |
454 frame lsb_timestamp=2 -> timestamp=258 | |
455 frame lsb_timestamp=3 -> timestamp=259 | |
12110
a34dc5a369ca
restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents:
12084
diff
changeset
|
456 all timestamps of keyframes of a single stream MUST be monotone |
9294 | 457 |
12333 | 458 dts |
459 dts are calculated by using a decode_delay+1 sized buffer for each | |
460 stream, into which the current pts is inserted and the element with | |
461 the smallest value is removed, this is then the current dts | |
462 this buffer is initalized with decode_delay -1 elements | |
463 all frames with dts == timestamp must be monotone, that means a frame | |
464 which occures later in the stream must have a larger or equal dts | |
465 then an earlier frame | |
466 FIXME rename timestamp* to pts* ? | |
467 | |
9294 | 468 width/height |
469 MUST be set to the coded width/height | |
470 | |
471 sample_width/sample_height (aspect ratio) | |
472 sample_width is the horizontal distance between samples | |
473 sample_width and sample_height MUST be relative prime if not zero | |
474 MUST be 0 if unknown | |
475 | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
476 colorspace_type |
10166 | 477 0 unknown |
478 1 ITU Rec 624 / ITU Rec 601 Y range: 16..235 Cb/Cr range: 16..240 | |
479 2 ITU Rec 709 Y range: 16..235 Cb/Cr range: 16..240 | |
480 17 ITU Rec 624 / ITU Rec 601 Y range: 0..255 Cb/Cr range: 0..255 | |
481 18 ITU Rec 709 Y range: 0..255 Cb/Cr range: 0..255 | |
482 | |
12333 | 483 samplerate_nom / samplerate_denom = samplerate |
484 the number of samples per second | |
9294 | 485 |
486 checksum | |
12118
b8fea9441d02
switching from crc32 to adler32 checksums, cuz they are faster and simpler
michael
parents:
12117
diff
changeset
|
487 adler32 checksum |
9294 | 488 |
489 index_timestamp | |
12502 | 490 value of the timetamp in a sync point relative to the last sync-point |
9294 | 491 |
492 index_position | |
12502 | 493 position in bytes of the first byte of a sync-point, relative to the |
494 last sync_point | |
9294 | 495 |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
496 id |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
497 the id of the type/name pair, so its more compact |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
498 0 means end |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
499 |
9323 | 500 type |
9347
97888c25ae60
changing name to "nut" for now, we can change it again if we agree on something else
michael
parents:
9335
diff
changeset
|
501 for example: "UTF8" -> String or "JPEG" -> jpeg image |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
502 Note: nonstandard fields should be prefixed by "X-" |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
503 Note: MUST be less than 6 byte long (might be increased to 64 later) |
9323 | 504 |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
505 info packet types |
9295 | 506 the name of the info entry, valid names are |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
507 |
9347
97888c25ae60
changing name to "nut" for now, we can change it again if we agree on something else
michael
parents:
9335
diff
changeset
|
508 "Author" |
97888c25ae60
changing name to "nut" for now, we can change it again if we agree on something else
michael
parents:
9335
diff
changeset
|
509 "Description" |
97888c25ae60
changing name to "nut" for now, we can change it again if we agree on something else
michael
parents:
9335
diff
changeset
|
510 "Copyright" |
9369 | 511 "Encoder" the name & version of the software used for encoding |
9347
97888c25ae60
changing name to "nut" for now, we can change it again if we agree on something else
michael
parents:
9335
diff
changeset
|
512 "Title" |
9373 | 513 "Cover" an image of the (cd,dvd,vhs,..) cover (preferable PNG or JPEG) |
9350 | 514 "Source" "DVD", "VCD", "CD", "MD", "FM radio", "VHS", "TV", |
515 "LD" | |
9373 | 516 Optional: appended PAL,NTSC,SECAM, ... in parentheses |
9350 | 517 "CaptureDevice" "BT878", "BT848", "webcam", ... (more exact names are fine too) |
518 "CreationTime" "2003-01-20 20:13:15Z", ... | |
519 (ISO 8601 format, see http://www.cl.cam.ac.uk/~mgk25/iso-time.html) | |
520 Note: dont forget the timezone | |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
521 "Keywords" |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
522 "TotalTime" total length of the stream in msecs |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
523 |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
524 meta packet types |
11975 | 525 "ReplayGain" |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
526 "Language" the language code |
12503 | 527 "Disposition" "original", "dub" (translated), "comment", "lyrics", "karaoke" |
9295 | 528 Note: if someone needs some others, please tell us about them, so we can |
529 add them to the official standard (if they are sane) | |
9360
add934b25d6d
"X-" prefix for nonstd fields & "keywords" idea by (Andreas Hess <jaska at gmx dot net>)
michael
parents:
9357
diff
changeset
|
530 Note: nonstandard fields should be prefixed by "X-" |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
531 Note: MUST be less than 64 bytes long |
9295 | 532 |
533 value | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
534 value of this name/type pair |
9295 | 535 |
9310 | 536 stuffing |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
537 0x80 can be placed infront of any type v entry for stuffing |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
538 purposes |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
539 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
540 info_table[][2]={ |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
541 {NULL , NULL }, // end |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
542 {NULL , NULL }, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
543 {NULL , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
544 {NULL , "v"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
545 {NULL , "s"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
546 {"Author" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
547 {"Titel" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
548 {"Description" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
549 {"Copyright" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
550 {"Encoder" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
551 {"Keyword" , "UTF8"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
552 {"Cover" , "JPEG"}, |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
553 {"Cover" , "PNG"}, |
13308
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
554 }; |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
555 |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
556 meta_table[][2]={ |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
557 {NULL , NULL }, // end |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
558 {NULL , NULL }, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
559 {NULL , "UTF8"}, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
560 {NULL , "v"}, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
561 {NULL , "s"}, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
562 {"Language" , to be decided}, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
563 {"Disposition" , to be decided}, |
8ff17d153414
info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents:
13047
diff
changeset
|
564 {"ReplayGain" , to be decided}, |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
565 }; |
9294 | 566 |
567 Structure: | |
568 | |
569 the headers MUST be in exactly the following order (to simplify demuxer design) | |
570 main header | |
571 stream_header (id=0) | |
572 stream_header (id=1) | |
573 ... | |
574 stream_header (id=n) | |
575 | |
576 headers may be repated, but if they are then they MUST all be repeated together | |
577 and repeated headers MUST be identical | |
12501 | 578 headers MAY only repeated at the closest possible positions after 2^x where x is |
579 an integer and the file end, so the headers may be repeated at 4102 if thats the | |
580 closest possition after 2^12=4096 at which the headers can be placed | |
9294 | 581 |
12501 | 582 headers MUST be placed at least at the begin of the file and immedeatly before |
583 the index or at the file end if there is no index | |
9310 | 584 headers MUST be repeated at least twice (so they exist 3 times in a file) |
9295 | 585 |
12501 | 586 a demuxer MUST not demux a stream which contains more than one stream, or which |
587 is wrapped in a structure to facilitate more than one stream or otherwise | |
588 duplicate the role of a container. any such file is to be considered invalid | |
589 | |
12503 | 590 info packets which describe the whole file or individual streams/tracks must be |
591 placed before any video/audio/... frames | |
592 | |
9310 | 593 Index |
12502 | 594 every sync-point must be exacty once in the index |
9311
4b04416ada91
zero_bit for normal frames, so we can distinguish them from other packets
michael
parents:
9310
diff
changeset
|
595 Note: in case of realtime streaming there is no end, so no index there either |
9310 | 596 |
597 Info packets | |
598 the info_packet can be repeated, it can also contain different names & values | |
599 each time but only if allso the time is different | |
600 Info packets can be used to describe the file or some part of it (chapters) | |
601 | |
602 info packets, SHOULD be placed at the begin of the file at least | |
603 for realtime streaming info packets will normally be transmitted when they apply | |
604 for example, the current song title & artist of the currently shown music video | |
605 | |
606 Unknown packets | |
12184 | 607 MUST be ignored by the demuxer |
9310 | 608 |
12501 | 609 demuxer (non-normative) |
610 | |
611 in the absence of valid header at beginning, players SHOULD search for backup | |
612 headers starting at offset 2^x for each x players SHOULD end their search from a | |
613 particular offset when any startcode is found (including syncpoint) | |
614 | |
615 | |
9294 | 616 Sample code (GPL, & untested) |
617 | |
618 typedef BufferContext{ | |
619 uint8_t *buf; | |
620 uint8_t *buf_ptr; | |
621 }BufferContext; | |
622 | |
623 static inline uint64_t get_bytes(BufferContext *bc, int count){ | |
624 uint64_t val=0; | |
625 | |
626 assert(count>0 && count<9) | |
627 | |
628 for(i=0; i<count; i++){ | |
629 val <<=8; | |
630 val += *(bc->buf_ptr++); | |
631 } | |
632 | |
633 return val; | |
634 } | |
635 | |
636 static inline void put_bytes(BufferContext *bc, int count, uint64_t val){ | |
637 uint64_t val=0; | |
638 | |
639 assert(count>0 && count<9) | |
640 | |
641 for(i=count-1; i>=0; i--){ | |
642 *(bc->buf_ptr++)= val >> (8*i); | |
643 } | |
644 | |
645 return val; | |
646 } | |
647 | |
10061 | 648 static inline uint64_t get_v(BufferContext *bc){ |
9294 | 649 uint64_t val= 0; |
650 | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
651 for(; space_left(bc) > 0; ){ |
9294 | 652 int tmp= *(bc->buf_ptr++); |
653 if(tmp&0x80) | |
654 val= (val<<7) + tmp - 0x80; | |
655 else | |
9299 | 656 return (val<<7) + tmp; |
9294 | 657 } |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
658 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
659 return -1; |
9294 | 660 } |
661 | |
10061 | 662 static inline int put_v(BufferContext *bc, uint64_t val){ |
9294 | 663 int i; |
664 | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
665 if(space_left(bc) < 9) return -1; |
9294 | 666 |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
667 val &= 0x7FFFFFFFFFFFFFFFULL; // FIXME can only encode upto 63 bits currently |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
668 for(i=7; ; i+=7){ |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
669 if(val>>i == 0) break; |
9294 | 670 } |
671 | |
10827 | 672 for(i-=7; i>0; i-=7){ |
9294 | 673 *(bc->buf_ptr++)= 0x80 | (val>>i); |
674 } | |
675 *(bc->buf_ptr++)= val&0x7F; | |
9579
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
676 |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
677 return 0; |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
678 } |
89d27a306886
*signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents:
9422
diff
changeset
|
679 |
12333 | 680 static int64_t get_dts(int64_t pts, int64_t *pts_cache, int delay, int reset){ |
681 if(reset) memset(pts_cache, -1, delay*sizeof(int64_t)); | |
682 | |
683 while(delay--){ | |
684 int64_t t= pts_cache[delay]; | |
685 if(t < pts){ | |
686 pts_cache[delay]= pts; | |
687 pts= t; | |
688 } | |
689 } | |
690 | |
691 return pts; | |
692 } | |
693 | |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
694 Authors |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
695 |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
696 Folks from MPlayer Developers Mailinglist (http://www.mplayehrq.hu/). |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
697 Authors in ABC-order: (FIXME! Tell us if we left you out) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
698 Beregszaszi, Alex (alex@fsn.hu) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
699 Bunkus, Moritz (moritz@bunkus.org) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
700 Diedrich, Tobias (td@sim.uni-hannover.de) |
12297 | 701 Felker, Rich (dalias@aerifal.cx) |
10158
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
702 Franz, Fabian (FabianFranz@gmx.de) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
703 Gereoffy, Arpad (arpi@thot.banki.hu) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
704 Hess, Andreas (jaska@gmx.net) |
93e5428d0b3e
some changes (michael: is the colorspace_type field needed?)
alex
parents:
10061
diff
changeset
|
705 Niedermayer, Michael (michaelni@gmx.at) |