annotate DOCS/tech/mpcf.txt @ 17710:9a976f1550f1

leading coeff for crc polynom
author michael
date Wed, 01 Mar 2006 13:37:09 +0000
parents acdde9d2b839
children 8aa18d8e5eb6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
1 ========================================
17547
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
2 NUT Open Container Format DRAFT 20060207
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
3 ========================================
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
4
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
5
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
6
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
7 Intro:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
8 ======
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
9
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
10 Features / goals:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
11 (supported by the format, not necessarily by a specific implementation)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
12
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
13 Simple
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
14 use the same encoding for nearly all fields
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
15 simple decoding, so slow CPUs (and embedded systems) can handle it
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
16
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
17 Extendible
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
18 no limit for the possible values of all fields (using universal vlc)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
19 allow adding of new headers in the future
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
20 allow adding more fields at the end of headers
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
21
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
22 Compact
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
23 ~0.2% overhead, for normal bitrates
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
24 index is <100kb per hour
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
25 a usual header for a file is about 100 bytes (audio + video headers together)
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
26 a packet header is about ~1-5 bytes
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
27
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
28 Error resistant
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
29 seeking / playback without an index
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
30 headers & index can be repeated
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
31 damaged files can be played back with minimal data loss and fast
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
32 resync times
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
33
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
34
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
35
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
36 Definitions:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
37 ============
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
38
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
39 MUST the specific part must be done to conform to this standard
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
40 SHOULD it is recommended to be done that way, but not strictly required
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
41
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
42
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
43
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
44 Syntax:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
45 =======
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
46
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
47 Since NUT heavily uses variable length fields, the simplest way to describe it
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
48 is using a pseudocode approach.
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
49
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
50
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
51
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
52 Conventions:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
53 ============
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
54
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
55 The data types have a name, used in the bitstream syntax description, a short
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
56 text description and a pseudocode (functional) definition, optional notes may
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
57 follow:
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
58
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
59 name (text description)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
60 functional definition
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
61 [Optional notes]
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
62
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
63 The bitstream syntax elements have a tagname and a functional definition, they
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
64 are presented in a bottom up approach, again optional notes may follow and
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
65 are reproduced in the tag description:
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
66
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
67 name: (optional note)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
68 functional definition
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
69 [Optional notes]
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
70
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
71 The in-depth tag description follows the bitstream syntax.
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
72 The functional definition has a C-like syntax.
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
73
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
74
12209
3baef37d3b7c moving f() and u()
michael
parents: 12208
diff changeset
75
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
76 Type definitions:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
77 =================
12209
3baef37d3b7c moving f() and u()
michael
parents: 12208
diff changeset
78
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
79 f(n) (n fixed bits in big-endian order)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
80 u(n) (unsigned number encoded in n bits in MSB-first order)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
81
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
82 v (variable length value, unsigned)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
83 value=0
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
84 do{
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
85 more_data u(1)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
86 data u(7)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
87 value= 128*value + data
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
88 }while(more_data)
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
89
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
90 s (variable length value, signed)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
91 temp v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
92 temp++
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
93 if(temp&1) value= -(temp>>1)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
94 else value= (temp>>1)
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
95
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
96 b (binary data or string, to be use in vb, see below)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
97 for(i=0; i<length; i++){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
98 data[i] u(8)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
99 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
100 [Note: strings MUST be encoded in UTF-8]
9295
michael
parents: 9294
diff changeset
101
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
102 vb (variable length binary data or string)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
103 length v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
104 value b
12117
e1e5e2124dae minor changes
michael
parents: 12110
diff changeset
105
9295
michael
parents: 9294
diff changeset
106
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
107
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
108 Bitstream syntax:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
109 =================
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
110
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
111 Common elements:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
112 ----------------
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
113
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
114 reserved_bytes:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
115 for(i=0; i<forward_ptr - length_of_non_reserved; i++)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
116 reserved u(8)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
117 [a demuxer MUST ignore any reserved bytes
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
118 a muxer MUST NOT write any reserved bytes, as this would make it
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
119 impossible to add new fields at the end of packets in the future
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
120 in a compatible way]
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
121
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
122 Headers:
10824
d163db068a12 reserved_bytes & byte order stuff
michael
parents: 10817
diff changeset
123
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
124 main header:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
125 main_startcode f(64)
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
126 forward_ptr v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
127 version v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
128 stream_count v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
129 max_distance v
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
130 tmp_pts=0
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
131 tmp_mul=1
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
132 tmp_stream=0
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
133 for(i=0; i<256; ){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
134 tmp_flag v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
135 tmp_fields v
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
136 if(tmp_fields>0) tmp_sflag v
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
137 else tmp_sflag=0
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
138 if(tmp_fields>1) tmp_pts s
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
139 if(tmp_fields>2) tmp_mul v
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
140 if(tmp_fields>3) tmp_stream v
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
141 if(tmp_fields>4) tmp_size v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
142 else tmp_size=0
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
143 if(tmp_fields>5) tmp_res v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
144 else tmp_res=0
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
145 if(tmp_fields>6) count v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
146 else count= tmp_mul - tmp_size
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
147 for(j=7; j<tmp_fields; j++){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
148 tmp_reserved[i] v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
149 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
150 for(j=0; j<count && i<256; j++, i++){
17612
99b6205ff32c Make 'N' frame code implictly invalid
ods15
parents: 17585
diff changeset
151 if (i == 'N') {
99b6205ff32c Make 'N' frame code implictly invalid
ods15
parents: 17585
diff changeset
152 flags[i]= 4;
99b6205ff32c Make 'N' frame code implictly invalid
ods15
parents: 17585
diff changeset
153 j--;
99b6205ff32c Make 'N' frame code implictly invalid
ods15
parents: 17585
diff changeset
154 continue;
99b6205ff32c Make 'N' frame code implictly invalid
ods15
parents: 17585
diff changeset
155 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
156 flags[i]= tmp_flag;
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
157 stream_flags[i]= tmp_sflag;
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
158 stream_id_plus1[i]= tmp_stream;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
159 data_size_mul[i]= tmp_mul;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
160 data_size_lsb[i]= tmp_size + j;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
161 pts_delta[i]= tmp_pts;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
162 reserved_count[i]= tmp_res;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
163 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
164 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
165 reserved_bytes
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
166 checksum u(32)
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
167
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
168 stream_header:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
169 stream_startcode f(64)
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
170 forward_ptr v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
171 stream_id v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
172 stream_class v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
173 fourcc vb
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
174 time_base_nom v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
175 time_base_denom v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
176 msb_pts_shift v
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
177 max_pts_distance v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
178 decode_delay v
17671
7f3f86ed5409 fix bit specification for fixed_fps
ods15
parents: 17669
diff changeset
179 reserved u(7)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
180 fixed_fps u(1)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
181 codec_specific_data vb
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
182 if(stream_class == video){
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
183 width v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
184 height v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
185 sample_width v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
186 sample_height v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
187 colorspace_type v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
188 }else if(stream_class == audio){
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
189 samplerate_nom v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
190 samplerate_denom v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
191 channel_count v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
192 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
193 reserved_bytes
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
194 checksum u(32)
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
195
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
196 Basic Packets:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
197
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
198 frame:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
199 frame_code f(8)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
200 if(stream_id_plus1[frame_code]==0){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
201 stream_id v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
202 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
203 if(pts_delta[frame_code]==0){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
204 coded_pts v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
205 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
206 if(flags[frame_code]&1){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
207 data_size_msb v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
208 }
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
209 if(flags[frame_code]&2){
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
210 coded_stream_flags v
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
211 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
212 for(i=0; i<reserved_count[frame_code]; i++)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
213 reserved v
17584
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
214 if (after_syncpoint){
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
215 syncpoint_checksum u(32)
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
216 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
217 data
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
218
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
219 index:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
220 index_startcode f(64)
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
221 forward_ptr v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
222 max_pts v
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
223 syncpoints v
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
224 for(i=0; i<syncpoints; i++){
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
225 syncpoint_pos_div8 v
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
226 }
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
227 for(i=0; i<stream_count; i++){
17615
363d23eb55d3 fix index, first keyframe cannot be written with pts=0
ods15
parents: 17612
diff changeset
228 last_pts= -1
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
229 for(j=0; j<syncpoints; ){
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
230 x v
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
231 type= x & 1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
232 x>>=1
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
233 n=j
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
234 if(type){
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
235 flag= x & 1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
236 x>>=1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
237 while(x--)
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
238 has_keyframe[n++][i]=flag
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
239 has_keyframe[n++][i]=!flag;
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
240 }else{
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
241 while(x != 1){
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
242 has_keyframe[n++][i]=x&1;
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
243 x>>=1;
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
244 }
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
245 }
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
246 for(; j<n && j<syncpoints; j++){
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
247 if (!has_keyframe[j][i]) continue
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
248 A v
17531
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
249 if(!A){
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
250 A v
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
251 B v
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
252 eor_pts[j][i] = last_pts + A + B
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
253 }else
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
254 B=0
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
255 keyframe_pts[j][i] = last_pts + A
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
256 last_pts += A + B
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
257 }
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
258 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
259 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
260 reserved_bytes
17585
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
261 index_ptr u(64)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
262 checksum u(32)
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
263
16506
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
264 info_frame: (optional)
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
265 stream_id_plus1 v
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
266 chapter_id v
17708
11a96a862d43 remove chapter_id == 0 special case
michael
parents: 17686
diff changeset
267 chapter_start v
11a96a862d43 remove chapter_id == 0 special case
michael
parents: 17686
diff changeset
268 chapter_len v
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
269 count v
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
270 for(i=0; i<count; i++){
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
271 name vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
272 value s
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
273 if (value==-1){
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
274 type= "UTF-8"
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
275 value vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
276 }else if (value==-2){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
277 type vb
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
278 value vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
279 }else if (value==-3){
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
280 type= "s"
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
281 value s
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
282 }else if (value<-3){
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
283 type= "r"
17684
325a2a565995 allow rationals with denom of '1'
ods15
parents: 17683
diff changeset
284 value.den= -value-3
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
285 value.num s
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
286 }else{
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
287 type= "v"
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
288 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
289 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
290 reserved_bytes
17491
1de8f7a7ad32 cosmetic, fix spacing
ods15
parents: 17455
diff changeset
291 checksum u(32)
16506
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
292
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
293 info_packet: (optional)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
294 info_startcode f(64)
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
295 forward_ptr v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
296 info_frame
16506
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
297
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
298 syncpoint:
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
299 syncpoint_startcode f(64)
17328
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
300 coded_pts v
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
301 stream = coded_pts % stream_count
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
302 global_key_pts = coded_pts/stream_count
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
303 back_ptr_div8 v
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
304
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
305 Complete definition:
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
306
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
307 file:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
308 file_id_string
17533
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
309 while(!eof){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
310 main_header
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
311 for(i=0; i<stream_count; i++){
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
312 stream_header
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
313 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
314 while(next_code == info_startcode){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
315 info_packet
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
316 }
17533
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
317 if(next_code == index_startcode){
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
318 index
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
319 }
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
320 if (!eof) while(next_code != main_startcode){
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
321 if(next_code == syncpoint_startcode)
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
322 syncpoint
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
323 frame
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
324 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
325 }
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
326
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
327
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
328 Tag description:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
329 ----------------
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
330
12242
f67bc1d216a1 file_id_string (idea by ivan)
michael
parents: 12238
diff changeset
331 file_id_string
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
332 "nut/multimedia container\0"
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
333
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
334 *_startcode
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
335 all startcodes start with 'N'
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
336
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
337 main_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
338 0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48)
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
339
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
340 stream_starcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
341 0x11405BF2F9DBULL + (((uint64_t)('N'<<8) + 'S')<<48)
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
342
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
343 syncpoint_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
344 0xE4ADEECA4569ULL + (((uint64_t)('N'<<8) + 'K')<<48)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
345
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
346 index_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
347 0xDD672F23E64EULL + (((uint64_t)('N'<<8) + 'X')<<48)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
348
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
349 info_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
350 0xAB68B596BA78ULL + (((uint64_t)('N'<<8) + 'I')<<48)
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
351
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
352 version
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
353 NUT version. The current value is 2.
12238
a0ddf85bdee0 removing backward pointers
michael
parents: 12209
diff changeset
354
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
355 forward_ptr
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
356 size of the packet data (exactly the distance from the first byte
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
357 after the forward_ptr to the first byte of the next packet)
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
358
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
359 max_distance
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
360 max distance of syncpoints, the distance may only be larger if
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
361 there is no more than a single frame between the two syncpoints. This can
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
362 be used by the demuxer to detect damaged frame headers if the damage
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
363 results in too long of a chain
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
364
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
365 syncpoints SHOULD be placed immediately before a keyframe if the
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
366 previous frame of the same stream was a non-keyframe, unless such
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
367 non-keyframe - keyframe transitions are very frequent
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
368
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
369 SHOULD be set to <=32768 or at least <=65536 unless there is a very
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
370 good reason to set it higher, otherwise reasonable error recovery will
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
371 be impossible
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
372
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
373 max_pts_distance
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
374 max absoloute difference of pts of new frame from last_pts in the
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
375 timebase of the stream, without a syncpoint immediately before the
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
376 frame. Note that last_pts is not necessarily the pts of the last frame
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
377 on the same stream, as it is altered by syncpoint timestamps.
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
378
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
379 stream_id
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
380 Stream identifier
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
381 stream_id MUST be < stream_count
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
382
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
383 stream_class
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
384 0 video
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
385 1 audio
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
386 2 subtiles
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
387 3 metadata
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
388 4 userdata
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
389 in metadata streams each frame contains exactly one info frame
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
390 Note: the remaining values are reserved and MUST NOT be used
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
391 a demuxer MUST ignore streams with reserved classes
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
392
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
393 fourcc
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
394 identification for the codec
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
395 example: "H264"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
396 MUST contain 2 or 4 bytes, note, this might be increased in the future
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
397 if needed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
398
9297
8a19be9649e7 use fraction for time_base
michael
parents: 9296
diff changeset
399 time_base_nom / time_base_denom = time_base
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
400 the length of a timer tick in seconds, this MUST be equal to the 1/fps
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
401 if fixed_fps is 1
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
402 time_base_nom and time_base_denom MUST NOT be 0
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
403 time_base_nom and time_base_denom MUST be relatively prime
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
404 time_base_denom MUST be < 2^31
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
405 examples:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
406 fps time_base_nom time_base_denom
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
407 30 1 30
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
408 29.97 1001 30000
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
409 23.976 1001 24000
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
410
17328
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
411 convert_ts
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
412 To switch from 2 different timebases, the following calculation is
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
413 defined:
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
414
17328
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
415 ln = from_time_base_nom*to_time_base_denom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
416 sn = from_timestamp
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
417 d1 = from_time_base_denom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
418 d2 = to_time_base_nom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
419 timestamp = (ln/d1*sn + ln%d1*sn/d1)/d2
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
420 Note: this calculation MUST be done with unsigned 64 bit integers, and
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
421 is equivalent to (ln*sn)/(d1*d2) but this would require a 96bit integer
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
422
17532
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
423 compare_ts
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
424 Compares timestamps from 2 different timebases,
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
425 if a is before b then compare_ts(a, b) = -1
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
426 if a is after b then compare_ts(a, b) = 1
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
427 else compare_ts(a, b) = 0
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
428
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
429 Care must be taken that this is done exactly with no rounding errors,
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
430 simply casting to float or double and doing the obvious
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
431 a*timebase > b*timebase is not compliant or correct, neither is the
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
432 same with integers, and
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
433 a*a_timebase.num*b_timebase.den > b*b_timebase.num*a_timebase.den
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
434 will overflow. One possible implementation which shouldn't overflow
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
435 within the range of legal timestamps and timebases is:
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
436
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
437 if (convert_ts(a, a_timebase, b_timebase) < b) return -1;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
438 if (convert_ts(b, b_timebase, a_timebase) < a) return 1;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
439 return 0;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
440
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
441 msb_pts_shift
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
442 amount of bits in lsb_pts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
443 MUST be <16
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
444
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
445 decode_delay
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
446 maximum time between input and output for a codec, used to generate
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
447 dts from pts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
448 is set to 0 for streams without B-frames, and set to 1 for streams with
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
449 B-frames, may be larger for future codecs
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
450 decode_delay MUST NOT be set higher than necessary for a codec.
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
451
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
452 fixed_fps
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
453 1 indicates that the fps is fixed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
454
9356
025a25987ac0 simplification
michael
parents: 9350
diff changeset
455 codec_specific_data
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
456 private global data for a codec (could be huffman tables or ...)
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
457
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
458 frame_code
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
459 the meaning of this byte is stored in the main header
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
460 the value 78 ('N') is forbidden to ensure that the byte is always
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
461 different from the first byte of any startcode
9420
8a1a8f5e9c91 variable subpacket size support
michael
parents: 9373
diff changeset
462
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
463 flags[frame_code]
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
464 Bit Name Description
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
465 1 data_size_msb if set, data_size_msb is at frame header,
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
466 otherwise data_size_msb is 0
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
467 2 more_flags if set, stream control flags are at frame header.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
468 4 invalid if set, frame_code is invalid.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
469
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
470 stream_flags
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
471 stream_flags is "stream_flags[frame_code] ^ coded_stream_flags"
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
472
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
473 Bit Name Description
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
474 1 is_key if set, frame is keyframe
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
475 2 end_of_relevance if set, stream has no relevance on
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
476 presentation. (EOR)
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
477
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
478 EOR frames MUST be zero-length and must be set keyframe.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
479 All streams SHOULD end with EOR, where the pts of the EOR indicates the
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
480 end presentation time of the final frame.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
481 An EOR set stream is unset by the first content frames.
17551
6c3ca4e1fceb EOR can only be (un)set for non delayed streams.
ods15
parents: 17547
diff changeset
482 EOR can only be unset in streams with zero decode_delay .
12110
a34dc5a369ca restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents: 12084
diff changeset
483
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
484 stream_id_plus1[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
485 must be <250
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
486 if it is 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
487
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
488 data_size_mul[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
489 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
490
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
491 data_size_lsb[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
492 must be <16384
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
493
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
494 pts_delta[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
495 must be <16384 and >-16384
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
496
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
497 reserved_count[frame_code]
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
498 must be <256
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
499
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
500 data_size
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
501 data_size= data_size_lsb + data_size_msb*data_size_mul;
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
502
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
503 coded_pts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
504 if coded_pts < (1<<msb_pts_shift) then it is an lsb
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
505 pts, otherwise it is a full pts + (1<<msb_pts_shift)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
506 lsb pts is converted to a full pts by:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
507 mask = (1<<msb_pts_shift)-1;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
508 delta = last_pts - mask/2
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
509 pts = ((pts_lsb-delta)&mask) + delta
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
510
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
511 lsb_pts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
512 least significant bits of the pts in time_base precision
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
513 Example: IBBP display order
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
514 keyframe pts=0 -> pts=0
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
515 frame lsb_pts=3 -> pts=3
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
516 frame lsb_pts=1 -> pts=1
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
517 frame lsb_pts=2 -> pts=2
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
518 ...
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
519 keyframe msb_pts=257 -> pts=257
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
520 frame lsb_pts=255 -> pts=255
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
521 frame lsb_pts=0 -> pts=256
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
522 frame lsb_pts=4 -> pts=260
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
523 frame lsb_pts=2 -> pts=258
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
524 frame lsb_pts=3 -> pts=259
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
525 all pts's of keyframes of a single stream MUST be monotone
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
526
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
527 dts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
528 dts is calculated by using a decode_delay+1 sized buffer for each
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
529 stream, into which the current pts is inserted and the element with
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
530 the smallest value is removed, this is then the current dts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
531 this buffer is initalized with decode_delay -1 elements
17327
2a1cc9c01f64 MN rule
ods15
parents: 17326
diff changeset
532
2a1cc9c01f64 MN rule
ods15
parents: 17326
diff changeset
533 Pts of all frames in all streams MUST be bigger or equal to dts of all
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
534 previous frames in all streams, compared in common timebase. (EOR
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
535 frames are NOT exempt from this rule)
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
536
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
537 width/height
17709
acdde9d2b839 width/height/samplerate MUST not be 0
michael
parents: 17708
diff changeset
538 MUST be set to the coded width/height, MUST not be 0
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
539
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
540 sample_width/sample_height (aspect ratio)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
541 sample_width is the horizontal distance between samples
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
542 sample_width and sample_height MUST be relatively prime if not zero
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
543 MUST be 0 if unknown
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
544
10158
93e5428d0b3e some changes (michael: is the colorspace_type field needed?)
alex
parents: 10061
diff changeset
545 colorspace_type
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
546 0 unknown
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
547 1 ITU Rec 624 / ITU Rec 601 Y range: 16..235 Cb/Cr range: 16..240
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
548 2 ITU Rec 709 Y range: 16..235 Cb/Cr range: 16..240
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
549 17 ITU Rec 624 / ITU Rec 601 Y range: 0..255 Cb/Cr range: 0..255
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
550 18 ITU Rec 709 Y range: 0..255 Cb/Cr range: 0..255
10166
e860465ef46e colorspace_type
michael
parents: 10158
diff changeset
551
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
552 samplerate_nom / samplerate_denom = samplerate
17709
acdde9d2b839 width/height/samplerate MUST not be 0
michael
parents: 17708
diff changeset
553 the number of samples per second, MUST not be 0
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
554
17683
39f67ee74bfe CRC32 stuff
ods15
parents: 17671
diff changeset
555 crc32 checksum
17710
9a976f1550f1 leading coeff for crc polynom
michael
parents: 17709
diff changeset
556 Generator polynomial is 0x104C11DB7. Starting value is zero.
17683
39f67ee74bfe CRC32 stuff
ods15
parents: 17671
diff changeset
557
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
558 checksum
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
559 crc32 checksum
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
560 checksum is calculated for the area pointed to by forward_ptr not
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
561 including the checksum itself (from first byte after the
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
562 forward_ptr until last byte before the checksum).
17639
56ec8716e25b some cleanup. enforce decode_delay to not be too high.
ods15
parents: 17615
diff changeset
563 In the case of info frames, covers area from begginning of frame.
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
564
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
565 Syncpoint tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
566 ---------------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
567
17584
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
568 syncpoint_checksum
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
569 crc32 checksum
17686
eadca2812177 cosmetic, trailing whitespace
ods15
parents: 17685
diff changeset
570 checksum covers from first byte after syncpoint startcode until last
17584
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
571 byte before the syncpoint_checksum.
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
572
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
573 back_ptr_div8
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
574 back_ptr = back_ptr_div8 * 8 + 7
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
575 back_ptr must point to a position within 8 bytes of a syncpoint
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
576 startcode. This syncpoint MUST be the closest syncpoint such that at
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
577 least one keyframe with a pts lower or equal to the original syncpoint's
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
578 global_key_pts for all streams lies between it and the current syncpoint.
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
579
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
580 A stream where EOR is set is to be ignored for back_ptr.
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
581
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
582 global_key_pts
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
583 After a syncpoint, last_pts of each stream is to be set to:
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
584 last_pts[i] = convert_ts(global_key_pts, timebase[stream], timebase[i])
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
585
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
586 global_key_pts MUST be bigger or equal to dts of all past frames across
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
587 all streams, and smaller or equal to pts of all future frames.
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
588
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
589 Index tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
590 -----------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
591
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
592 max_pts
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
593 s = max_pts % stream_count
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
594 pts = max_pts / stream_count
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
595 The highest pts in the entire file in the timebase of stream 's' .
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
596
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
597 syncpoint_pos_div8
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
598 offset from begginning of file to up to 7 bytes before the syncpoint
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
599 referred to in this index entry. Relative to position of last
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
600 syncpoint.
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
601
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
602 has_keyframe
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
603 indicates whether this stream has a keyframe between this syncpoint and
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
604 the last syncpoint.
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
605
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
606 keyframe_pts
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
607 The pts of the first keyframe for this stream in the region between the
17531
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
608 2 syncpoints, in the stream's timebase. (EOR frames are also keyframes)
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
609
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
610 eor_pts
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
611 Coded only if EOR is set at the position of the syncpoint. The pts of
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
612 that EOR. EOR is unset by the first keyframe after it.
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
613
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
614 index_ptr
17585
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
615 Length in bytes of the entire index, from the first byte of the
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
616 startcode until the last byte of the checksum.
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
617 Note: A demuxer can use this to find the index when it is written at
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
618 EOF, as index_ptr will always be 12 bytes before the end of file if
03829916a1c3 Put index_ptr within index to avoid it popping out of nowhere.
ods15
parents: 17584
diff changeset
619 there is an index at all.
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
620
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
621 Info tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
622 ----------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
623
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
624 stream_id_plus1
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
625 Stream this info packet applies to. If zero, packet applies to whole
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
626 file.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
627
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
628 chapter_id
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
629 Id of chapter this packet applies to. If zero, packet applies to whole
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
630 file. Positive chapter_id's are real chapters and MUST NOT overlap.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
631 Negative chapter_id indicate a sub region of file and not a real
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
632 chapter. chapter_id MUST be unique to the region it represents.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
633
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
634 chapter_start
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
635 s= chapter_start % stream_count
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
636 timestamp= chapter_start / stream_count
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
637 timestamp of start of chapter in timebase of stream 's'.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
638
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
639 chapter_len
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
640 Length of chapter in same timebase of chapter_start.
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
641
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
642 type
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
643 for example: "UTF8" -> string or "JPEG" -> JPEG image
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
644 "v" -> unsigned integer
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
645 "s" -> signed integer
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
646 "r" -> rational
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
647 Note: nonstandard fields should be prefixed by "X-"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
648 Note: MUST be less than 6 byte long (might be increased to 64 later)
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
649
13308
8ff17d153414 info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents: 13047
diff changeset
650 info packet types
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
651 the name of the info entry, valid names are
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
652 "Author"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
653 "Description"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
654 "Copyright"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
655 "Encoder"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
656 the name & version of the software used for encoding
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
657 "Title"
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
658 "Cover" (allowed types are "PNG" and "JPEG")
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
659 image of the (CD, DVD, VHS, ..) cover (preferably PNG or JPEG)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
660 "Source"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
661 "DVD", "VCD", "CD", "MD", "FM radio", "VHS", "TV", "LD"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
662 Optional: appended PAL, NTSC, SECAM, ... in parentheses
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
663 "CaptureDevice"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
664 "BT878", "BT848", "webcam", ... (more exact names are fine too)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
665 "CreationTime"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
666 "2003-01-20 20:13:15Z", ...
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
667 (ISO 8601 format, see http://www.cl.cam.ac.uk/~mgk25/iso-time.html)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
668 Note: do not forget the timezone
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
669 "Keywords"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
670 "Language"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
671 ISO 639 and ISO 3166 for language/country code
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
672 something like "eng" (US english), can be 0 if unknown
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
673 and "multi" if several languages
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
674 see http://www.loc.gov/standards/iso639-2/englangn.html
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
675 and http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/en_listp1.html
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
676 the language code
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
677 "Disposition"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
678 "original", "dub" (translated), "comment", "lyrics", "karaoke"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
679 Note: if someone needs some others, please tell us about them, so we
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
680 can add them to the official standard (if they are sane)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
681 Note: nonstandard fields should be prefixed by "X-"
17686
eadca2812177 cosmetic, trailing whitespace
ods15
parents: 17685
diff changeset
682 Note: names of fields SHOULD be in English if a word with the same
17653
9ef8d2944c21 fields should be in english...
ods15
parents: 17640
diff changeset
683 meaning exists in English
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
684 Note: MUST be less than 64 bytes long
9295
michael
parents: 9294
diff changeset
685
michael
parents: 9294
diff changeset
686 value
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
687 value of this name/type pair
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
688
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
689 stuffing
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
690 0x80 can be placed in front of any type v entry for stuffing purposes
9579
89d27a306886 *signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents: 9422
diff changeset
691
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
692
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
693
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
694 Structure:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
695 ----------
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
696
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
697 the headers MUST be in exactly the following order (to simplify demuxer design)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
698 main header
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
699 stream_header (id=0)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
700 stream_header (id=1)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
701 ...
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
702 stream_header (id=n)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
703
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
704 headers may be repeated, but if they are, then they MUST all be repeated
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
705 together and repeated headers MUST be identical
17547
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
706
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
707 Each set of repeated headers not at the beginning or end of the file SHOULD
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
708 be stored at the earliest possible position after 2^x where x is
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
709 an integer and the file end, so the headers may be repeated at 4102 if that is
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
710 the closest position after 2^12=4096 at which the headers can be placed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
711
17547
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
712 Note: this allows an implementation reading the file to locate backup
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
713 headers in O(log filesize) time as opposed to O(filesize)
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
714
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
715 headers MUST be placed at least at the start of the file and immediately before
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
716 the index or at the file end if there is no index
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
717 headers MUST be repeated at least twice (so they exist three times in a file)
9295
michael
parents: 9294
diff changeset
718
16685
diego
parents: 16574
diff changeset
719 there MUST be a sync point immediately before the first frame after any headers
12503
a160a68209ac disposition
michael
parents: 12502
diff changeset
720
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
721
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
722 Index:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
723 ------
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
724
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
725 Note: with realtime streaming, there is no end, so no index there either
17533
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
726 Index MAY only be repeated after main headers.
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
727 If an index is written anywhere in the file, it MUST be written at end of
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
728 file as well.
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
729
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
730
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
731 Info:
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
732 -----
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
733
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
734 All info packets with the same chapter_id and stream_id are repeated info
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
735 packets and MUST be binary identical.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
736
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
737 All info packets MUST appear after main headers at begginning of file, and
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
738 SHOULD be repeated after all main headers unless they are very large.
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
739
16506
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
740 Info frames can be used to describe the file or some part of it (chapters)
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
741
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
742 Info SHOULD be stored in global packets instead of info streams/frames if
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
743 possible, and the amount of data is not large.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
744
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
745
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
746 demuxer (non-normative):
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
747 ------------------------
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
748
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
749 in the absence of a valid header at the beginning, players SHOULD search for
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
750 backup headers starting at offset 2^x; for each x players SHOULD end their
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
751 search at a particular offset when any startcode is found (including syncpoint)
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
752
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
753
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
754
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
755 Semantic requirements:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
756 ======================
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
757
17018
baf593fcf738 Change MUST to SHOULD have disposition and if applicable language tags.
al
parents: 16843
diff changeset
758 If more than one stream of a given stream class is present, each one SHOULD
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
759 have info tags specifying disposition, and if applicable, language.
17018
baf593fcf738 Change MUST to SHOULD have disposition and if applicable language tags.
al
parents: 16843
diff changeset
760 It often highly improves usability and is therefore strongly encouraged.
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
761
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
762 A demuxer MUST NOT demux a stream which contains more than one stream, or which
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
763 is wrapped in a structure to facilitate more than one stream or otherwise
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
764 duplicate the role of a container. any such file is to be considered invalid.
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
765
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
766
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
767
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
768 Sample code (Public Domain, & untested):
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
769 ========================================
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
770
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
771 typedef BufferContext{
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
772 uint8_t *buf;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
773 uint8_t *buf_ptr;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
774 }BufferContext;
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
775
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
776 static inline uint64_t get_bytes(BufferContext *bc, int count){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
777 uint64_t val=0;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
778
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
779 assert(count>0 && count<9);
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
780
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
781 for(i=0; i<count; i++){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
782 val <<=8;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
783 val += *(bc->buf_ptr++);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
784 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
785
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
786 return val;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
787 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
788
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
789 static inline void put_bytes(BufferContext *bc, int count, uint64_t val){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
790 uint64_t val=0;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
791
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
792 assert(count>0 && count<9);
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
793
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
794 for(i=count-1; i>=0; i--){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
795 *(bc->buf_ptr++)= val >> (8*i);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
796 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
797
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
798 return val;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
799 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
800
10061
76b1c7d20da8 corrected the sample code
alex
parents: 9580
diff changeset
801 static inline uint64_t get_v(BufferContext *bc){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
802 uint64_t val= 0;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
803
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
804 for(; space_left(bc) > 0; ){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
805 int tmp= *(bc->buf_ptr++);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
806 if(tmp&0x80)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
807 val= (val<<7) + tmp - 0x80;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
808 else
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
809 return (val<<7) + tmp;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
810 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
811
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
812 return -1;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
813 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
814
10061
76b1c7d20da8 corrected the sample code
alex
parents: 9580
diff changeset
815 static inline int put_v(BufferContext *bc, uint64_t val){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
816 int i;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
817
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
818 if(space_left(bc) < 9) return -1;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
819
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
820 val &= 0x7FFFFFFFFFFFFFFFULL; // FIXME can only encode upto 63 bits currently
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
821 for(i=7; ; i+=7){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
822 if(val>>i == 0) break;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
823 }
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
824
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
825 for(i-=7; i>0; i-=7){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
826 *(bc->buf_ptr++)= 0x80 | (val>>i);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
827 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
828 *(bc->buf_ptr++)= val&0x7F;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
829
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
830 return 0;
9579
89d27a306886 *signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents: 9422
diff changeset
831 }
89d27a306886 *signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents: 9422
diff changeset
832
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
833 static int64_t get_dts(int64_t pts, int64_t *pts_cache, int delay, int reset){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
834 if(reset) memset(pts_cache, -1, delay*sizeof(int64_t));
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
835
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
836 while(delay--){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
837 int64_t t= pts_cache[delay];
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
838 if(t < pts){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
839 pts_cache[delay]= pts;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
840 pts= t;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
841 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
842 }
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
843
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
844 return pts;
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
845 }
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
846
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
847
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
848
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
849 Authors:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
850 ========
10158
93e5428d0b3e some changes (michael: is the colorspace_type field needed?)
alex
parents: 10061
diff changeset
851
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
852 Folks from the MPlayer developers mailing list (http://www.mplayerhq.hu/).
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
853 Authors in alphabetical order: (FIXME! Tell us if we left you out)
16843
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
854 Beregszaszi, Alex (alex@fsn.hu)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
855 Bunkus, Moritz (moritz@bunkus.org)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
856 Diedrich, Tobias (ranma+mplayer@tdiedrich.de)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
857 Felker, Rich (dalias@aerifal.cx)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
858 Franz, Fabian (FabianFranz@gmx.de)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
859 Gereoffy, Arpad (arpi@thot.banki.hu)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
860 Hess, Andreas (jaska@gmx.net)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
861 Niedermayer, Michael (michaelni@gmx.at)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
862 Shimon, Oded (ods15@ods15.dyndns.org)