annotate DOCS/tech/mpcf.txt @ 17798:2d02868030f0

double muxing examples (cant hurt to explictly mention the most common)
author michael
date Fri, 10 Mar 2006 14:23:22 +0000
parents b1d80d05eaa8
children 02139a9b7c7b
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
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
106 t (v coded universal timestamp)
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
107 tmp v
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
108 stream_id= tmp % stream_count
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
109 value= (tmp / stream_count) * stream[ stream_id ].timebase
9295
michael
parents: 9294
diff changeset
110
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
111
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
112 Bitstream syntax:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
113 =================
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
114
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
115 Common elements:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
116 ----------------
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
117
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
118 reserved_bytes:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
119 for(i=0; i<forward_ptr - length_of_non_reserved; i++)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
120 reserved u(8)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
121 [a demuxer MUST ignore any reserved bytes
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
122 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
123 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
124 in a compatible way]
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
125
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
126 Headers:
10824
d163db068a12 reserved_bytes & byte order stuff
michael
parents: 10817
diff changeset
127
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
128 main header:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
129 version v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
130 stream_count v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
131 max_distance v
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
132 tmp_pts=0
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
133 tmp_mul=1
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
134 tmp_stream=0
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
135 for(i=0; i<256; ){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
136 tmp_flag v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
137 tmp_fields v
17719
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
138 if(tmp_fields>0) tmp_pts s
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
139 if(tmp_fields>1) tmp_mul v
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
140 if(tmp_fields>2) tmp_stream v
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
141 if(tmp_fields>3) tmp_size v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
142 else tmp_size=0
17719
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
143 if(tmp_fields>4) tmp_res v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
144 else tmp_res=0
17719
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
145 if(tmp_fields>5) count v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
146 else count= tmp_mul - tmp_size
17719
6f1bc4789a5d update tmp_field numbers (pretty much just cosmetic)
michael
parents: 17718
diff changeset
147 for(j=6; 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') {
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
152 flags[i]= FLAG_INVALID;
17612
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;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
157 stream_id_plus1[i]= tmp_stream;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
158 data_size_mul[i]= tmp_mul;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
159 data_size_lsb[i]= tmp_size + j;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
160 pts_delta[i]= tmp_pts;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
161 reserved_count[i]= tmp_res;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
162 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
163 }
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
164
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
165 stream_header:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
166 stream_id v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
167 stream_class v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
168 fourcc vb
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
169 time_base_nom v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
170 time_base_denom v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
171 msb_pts_shift v
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
172 max_pts_distance v
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
173 max_frame_size v
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
174 decode_delay v
17671
7f3f86ed5409 fix bit specification for fixed_fps
ods15
parents: 17669
diff changeset
175 reserved u(7)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
176 fixed_fps u(1)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
177 codec_specific_data vb
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
178 if(stream_class == video){
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
179 width v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
180 height v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
181 sample_width v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
182 sample_height v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
183 colorspace_type v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
184 }else if(stream_class == audio){
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
185 samplerate_nom v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
186 samplerate_denom v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
187 channel_count v
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
188 }
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
189
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
190 Basic Packets:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
191
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
192 frame:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
193 frame_code f(8)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
194 if(stream_id_plus1[frame_code]==0){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
195 stream_id v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
196 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
197 if(pts_delta[frame_code]==0){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
198 coded_pts v
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
199 }
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
200 frame_flags= flags[frame_code]
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
201 if(frame_flags&FLAG_CODED){
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
202 coded_flags v
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
203 frame_flags ^= coded_flags
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
204 }
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
205 if(frame_flags&FLAG_SIZE_MSB){
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
206 data_size_msb v
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
207 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
208 for(i=0; i<reserved_count[frame_code]; i++)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
209 reserved v
17723
ods15
parents: 17722
diff changeset
210 if(frame_flags&FLAG_CHECKSUM){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
211 checksum u(32)
17584
187260c06b4f Add syncpoint_checksum after frame header
ods15
parents: 17577
diff changeset
212 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
213 data
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
214
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
215 index:
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
216 max_pts t
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
217 syncpoints v
17720
63755b0aca46 the return of the monolithic index
michael
parents: 17719
diff changeset
218 for(i=0; i<syncpoints; i++){
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
219 syncpoint_pos_div8 v
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
220 }
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
221 for(i=0; i<stream_count; i++){
17615
363d23eb55d3 fix index, first keyframe cannot be written with pts=0
ods15
parents: 17612
diff changeset
222 last_pts= -1
17720
63755b0aca46 the return of the monolithic index
michael
parents: 17719
diff changeset
223 for(j=0; j<syncpoints; ){
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
224 x v
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
225 type= x & 1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
226 x>>=1
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
227 n=j
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
228 if(type){
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
229 flag= x & 1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
230 x>>=1
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
231 while(x--)
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
232 has_keyframe[n++][i]=flag
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
233 has_keyframe[n++][i]=!flag;
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
234 }else{
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
235 while(x != 1){
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
236 has_keyframe[n++][i]=x&1;
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
237 x>>=1;
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
238 }
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
239 }
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
240 for(; j<n && j<syncpoints; j++){
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
241 if (!has_keyframe[j][i]) continue
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
242 A v
17531
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
243 if(!A){
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
244 A v
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
245 B v
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
246 eor_pts[j][i] = last_pts + A + B
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
247 }else
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
248 B=0
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
249 keyframe_pts[j][i] = last_pts + A
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
250 last_pts += A + B
17455
1bb20b4c4082 Interleave index to ease per-need decoding.
ods15
parents: 17439
diff changeset
251 }
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
252 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
253 }
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
254 last 8 reserved_bytes of index:
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
255 index_ptr u(64)
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
256
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
257 info_packet:
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
258 stream_id_plus1 v
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
259 chapter_id v
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
260 chapter_start t
17708
11a96a862d43 remove chapter_id == 0 special case
michael
parents: 17686
diff changeset
261 chapter_len v
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
262 count v
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
263 for(i=0; i<count; i++){
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
264 name vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
265 value s
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
266 if (value==-1){
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
267 type= "UTF-8"
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
268 value vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
269 }else if (value==-2){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
270 type vb
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
271 value vb
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
272 }else if (value==-3){
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
273 type= "s"
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
274 value s
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
275 }else if (value==-4){
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
276 type= "t"
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
277 value t
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
278 }else if (value<-4){
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
279 type= "r"
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
280 value.den= -value-4
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
281 value.num s
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
282 }else{
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
283 type= "v"
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
284 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
285 }
16506
1e42b8be5b7f add back_ptr
michael
parents: 16503
diff changeset
286
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
287 syncpoint:
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
288 global_key_pts t
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
289
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
290 Complete definition:
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
291
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
292 file:
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
293 file_id_string
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
294 while(!eof){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
295 if(next_byte == 'N'){
17773
1783a290fdf4 cosmetic
michael
parents: 17771
diff changeset
296 packet_header
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
297 switch(startcode){
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
298 case main_startcode: main_header; break;
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
299 case stream_startcode:stream_header; break;
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
300 case info_startcode: info_packet; break;
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
301 case index_startcode: index; break;
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
302 case syncpoint_startcode: syncpoint; break;
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
303 }
17773
1783a290fdf4 cosmetic
michael
parents: 17771
diff changeset
304 packet_footer
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
305 }else
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
306 frame
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
307 }
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
308
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
309 the structure of a undamaged file should look like the following, but
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
310 demuxers should be flexible and be able to deal with damaged headers so the
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
311 above is a better loop in practice (not to mention its simpler)
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
312 note, demuxers MUST be able to deal with new and unknown headers
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
313
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
314 packet_header
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
315 startcode f(64)
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
316 forward_ptr v
17792
fd980f31fbc2 header_checksum
michael
parents: 17773
diff changeset
317 if(forward_ptr > 4096)
fd980f31fbc2 header_checksum
michael
parents: 17773
diff changeset
318 header_checksum u(32)
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
319
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
320 packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
321 reserved_bytes
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
322 checksum u(32)
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
323
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
324 reserved_headers
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
325 while(next_byte == 'N' && next_code != main_startcode
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
326 && next_code != stream_startcode
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
327 && next_code != info_startcode
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
328 && next_code != index_startcode
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
329 && next_code != syncpoint_startcode){
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
330 packet_header
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
331 packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
332 }
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
333
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
334 file:
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
335 file_id_string
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
336 while(!eof){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
337 packet_header, main_header, packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
338 reserved_headers
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
339 for(i=0; i<stream_count; i++){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
340 packet_header, stream_header, packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
341 reserved_headers
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
342 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
343 while(next_code == info_startcode){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
344 packet_header, info_packet, packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
345 reserved_headers
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
346 }
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
347 if(next_code == index_startcode){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
348 packet_header, index_packet, packet_footer
17533
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
349 }
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
350 if (!eof) while(next_code != main_startcode){
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
351 if(next_code == syncpoint_startcode){
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
352 packet_header, syncpoint, packet_footer
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
353 }
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
354 frame
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
355 reserved_headers
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
356 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
357 }
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
358
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
359
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
360 Tag description:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
361 ----------------
14854
ebc5136f2a56 some comments and whitespace changes by (Luca Barbato <lu_zero gentoo org>)
michael
parents: 14471
diff changeset
362
12242
f67bc1d216a1 file_id_string (idea by ivan)
michael
parents: 12238
diff changeset
363 file_id_string
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
364 "nut/multimedia container\0"
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
365
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
366 *_startcode
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
367 all startcodes start with 'N'
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
368
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
369 main_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
370 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
371
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
372 stream_starcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
373 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
374
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
375 syncpoint_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
376 0xE4ADEECA4569ULL + (((uint64_t)('N'<<8) + 'K')<<48)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
377
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
378 index_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
379 0xDD672F23E64EULL + (((uint64_t)('N'<<8) + 'X')<<48)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
380
12162
ab533510d598 remove old example stream
michael
parents: 12161
diff changeset
381 info_startcode
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
382 0xAB68B596BA78ULL + (((uint64_t)('N'<<8) + 'I')<<48)
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
383
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
384 version
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
385 NUT version. The current value is 2.
12238
a0ddf85bdee0 removing backward pointers
michael
parents: 12209
diff changeset
386
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
387 forward_ptr
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
388 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
389 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
390
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
391 max_distance
17326
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
392 max distance of syncpoints, the distance may only be larger if
a9e170085990 1) change date and goals slightly
ods15
parents: 17230
diff changeset
393 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
394 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
395 results in too long of a chain
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
396
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
397 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
398 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
399 non-keyframe - keyframe transitions are very frequent
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
400
17722
6aa7f7e427a0 slightly better max_distance rule
michael
parents: 17720
diff changeset
401 SHOULD be set to <=32768
6aa7f7e427a0 slightly better max_distance rule
michael
parents: 17720
diff changeset
402 if the stored value is >65536 then max_distance MUST be set to 65536
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
403
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
404 max_pts_distance
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
405 max absoloute difference of pts of new frame from last_pts in the
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
406 timebase of the stream, without a checksum after the frameheader
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
407 Note that last_pts is not necessarily the pts of the last frame
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
408 on the same stream, as it is altered by syncpoint timestamps.
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
409
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
410 max_frame_size
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
411 max frame size without a checksum after the frameheader.
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
412 MUST be <=4*max_distance. If stored value is bigger then
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
413 max_frame_size MUST be set to 4*max_distance .
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
414
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
415 stream_id
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
416 Stream identifier
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
417 stream_id MUST be < stream_count
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
418
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
419 stream_class
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
420 0 video
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
421 1 audio
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
422 2 subtiles
17793
68d3692cfd47 push back userdata stream_class
ods15
parents: 17792
diff changeset
423 3 userdata
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
424 Note: the remaining values are reserved and MUST NOT be used
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
425 a demuxer MUST ignore streams with reserved classes
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
426
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
427 fourcc
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
428 identification for the codec
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
429 example: "H264"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
430 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
431 if needed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
432
9297
8a19be9649e7 use fraction for time_base
michael
parents: 9296
diff changeset
433 time_base_nom / time_base_denom = time_base
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
434 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
435 if fixed_fps is 1
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
436 time_base_nom and time_base_denom MUST NOT be 0
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
437 time_base_nom and time_base_denom MUST be relatively prime
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
438 time_base_denom MUST be < 2^31
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
439 examples:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
440 fps time_base_nom time_base_denom
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
441 30 1 30
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
442 29.97 1001 30000
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
443 23.976 1001 24000
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
444
17328
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
445 convert_ts
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
446 To switch from 2 different timebases, the following calculation is
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
447 defined:
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
448
17328
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
449 ln = from_time_base_nom*to_time_base_denom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
450 sn = from_timestamp
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
451 d1 = from_time_base_denom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
452 d2 = to_time_base_nom
33b03e1e4170 1) remove global_timebase
ods15
parents: 17327
diff changeset
453 timestamp = (ln/d1*sn + ln%d1*sn/d1)/d2
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
454 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
455 is equivalent to (ln*sn)/(d1*d2) but this would require a 96bit integer
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
456
17532
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
457 compare_ts
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
458 Compares timestamps from 2 different timebases,
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
459 if a is before b then compare_ts(a, b) = -1
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
460 if a is after b then compare_ts(a, b) = 1
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
461 else compare_ts(a, b) = 0
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
462
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
463 Care must be taken that this is done exactly with no rounding errors,
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
464 simply casting to float or double and doing the obvious
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
465 a*timebase > b*timebase is not compliant or correct, neither is the
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
466 same with integers, and
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
467 a*a_timebase.num*b_timebase.den > b*b_timebase.num*a_timebase.den
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
468 will overflow. One possible implementation which shouldn't overflow
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
469 within the range of legal timestamps and timebases is:
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
470
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
471 if (convert_ts(a, a_timebase, b_timebase) < b) return -1;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
472 if (convert_ts(b, b_timebase, a_timebase) < a) return 1;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
473 return 0;
724816ab19be add compare_ts
ods15
parents: 17531
diff changeset
474
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
475 msb_pts_shift
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
476 amount of bits in lsb_pts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
477 MUST be <16
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
478
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
479 decode_delay
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
480 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
481 dts from pts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
482 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
483 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
484 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
485
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
486 fixed_fps
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
487 1 indicates that the fps is fixed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
488
9356
025a25987ac0 simplification
michael
parents: 9350
diff changeset
489 codec_specific_data
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
490 private global data for a codec (could be huffman tables or ...)
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
491
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
492 frame_code
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
493 the meaning of this byte is stored in the main header
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
494 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
495 different from the first byte of any startcode
17794
ea0d4bc79bf1 0x00 and 0xFF should be invalid (libnut does that already and it seems like a good idea to recommand)
michael
parents: 17793
diff changeset
496 a muxer SHOULD mark 0x00 and 0xFF as invalid to improve error
ea0d4bc79bf1 0x00 and 0xFF should be invalid (libnut does that already and it seems like a good idea to recommand)
michael
parents: 17793
diff changeset
497 detection
9420
8a1a8f5e9c91 variable subpacket size support
michael
parents: 9373
diff changeset
498
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
499 flags[frame_code], frame_flags
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
500 Bit Name Description
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
501 1 FLAG_SIZE_MSB if set, data_size_msb is at frame header,
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
502 otherwise data_size_msb is 0
17718
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
503 2 FLAG_CHECKSUM if set then the frame header contains a checksum
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
504 4 FLAG_KEY if set, frame is keyframe
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
505 8 FLAG_EOR if set, stream has no relevance on
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
506 presentation. (EOR)
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
507 256 FLAG_CODED if set, coded_flags are stored in the frame header.
86bcb118eab1 simplify flags
michael
parents: 17714
diff changeset
508 512 FLAG_INVALID if set, frame_code is invalid.
17437
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
509
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
510 EOR frames MUST be zero-length and must be set keyframe.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
511 All streams SHOULD end with EOR, where the pts of the EOR indicates the
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
512 end presentation time of the final frame.
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
513 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
514 EOR can only be unset in streams with zero decode_delay .
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
515 FLAG_CHECKSUM MUST be set if the frame is larger than max_frame_size or
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
516 its pts differs by more then max_pts_distance from the last frame
12110
a34dc5a369ca restrictions to ensure that O(log n) seeking and error recovery is possible
michael
parents: 12084
diff changeset
517
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
518 stream_id_plus1[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
519 must be <250
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
520 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
521
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
522 data_size_mul[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
523 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
524
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
525 data_size_lsb[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
526 must be <16384
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
527
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
528 pts_delta[frame_code]
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
529 must be <16384 and >-16384
12413
87a6dc69b65a proposals by rich:
michael
parents: 12392
diff changeset
530
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
531 reserved_count[frame_code]
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
532 must be <256
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
533
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
534 data_size
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
535 data_size= data_size_lsb + data_size_msb*data_size_mul;
12082
f705b0777572 removing subpackets (everyone hates them ...)
michael
parents: 11975
diff changeset
536
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
537 coded_pts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
538 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
539 pts, otherwise it is a full pts + (1<<msb_pts_shift)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
540 lsb pts is converted to a full pts by:
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
541 mask = (1<<msb_pts_shift)-1;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
542 delta = last_pts - mask/2
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
543 pts = ((pts_lsb-delta)&mask) + delta
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
544
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
545 lsb_pts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
546 least significant bits of the pts in time_base precision
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
547 Example: IBBP display order
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
548 keyframe pts=0 -> pts=0
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
549 frame lsb_pts=3 -> pts=3
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
550 frame lsb_pts=1 -> pts=1
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
551 frame lsb_pts=2 -> pts=2
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
552 ...
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
553 keyframe msb_pts=257 -> pts=257
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
554 frame lsb_pts=255 -> pts=255
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
555 frame lsb_pts=0 -> pts=256
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
556 frame lsb_pts=4 -> pts=260
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
557 frame lsb_pts=2 -> pts=258
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
558 frame lsb_pts=3 -> pts=259
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
559 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
560
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
561 dts
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
562 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
563 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
564 the smallest value is removed, this is then the current dts
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
565 this buffer is initalized with decode_delay -1 elements
17327
2a1cc9c01f64 MN rule
ods15
parents: 17326
diff changeset
566
2a1cc9c01f64 MN rule
ods15
parents: 17326
diff changeset
567 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
568 previous frames in all streams, compared in common timebase. (EOR
e2f2a8ac648a bump date
ods15
parents: 17330
diff changeset
569 frames are NOT exempt from this rule)
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
570
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
571 width/height
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
572 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
573
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
574 sample_width/sample_height (aspect ratio)
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
575 sample_width is the horizontal distance between samples
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
576 sample_width and sample_height MUST be relatively prime if not zero
17795
a4e7458d61ed little clarification of sample_width/sample_height
michael
parents: 17794
diff changeset
577 both MUST be 0 if unknown otherwise both MUST be non zero
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
578
10158
93e5428d0b3e some changes (michael: is the colorspace_type field needed?)
alex
parents: 10061
diff changeset
579 colorspace_type
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
580 0 unknown
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
581 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
582 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
583 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
584 18 ITU Rec 709 Y range: 0..255 Cb/Cr range: 0..255
10166
e860465ef46e colorspace_type
michael
parents: 10158
diff changeset
585
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
586 samplerate_nom / samplerate_denom = samplerate
17730
a0d4f253e82b cosmetics, rename max_size to max_frame_size
ods15
parents: 17726
diff changeset
587 the number of samples per second, MUST NOT be 0
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
588
17683
39f67ee74bfe CRC32 stuff
ods15
parents: 17671
diff changeset
589 crc32 checksum
17710
9a976f1550f1 leading coeff for crc polynom
michael
parents: 17709
diff changeset
590 Generator polynomial is 0x104C11DB7. Starting value is zero.
17683
39f67ee74bfe CRC32 stuff
ods15
parents: 17671
diff changeset
591
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
592 checksum
17577
0f6b020f867d change checksum to crc32
ods15
parents: 17551
diff changeset
593 crc32 checksum
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
594 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
595 including the checksum itself (from first byte after the
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
596 forward_ptr until last byte before the checksum).
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
597 for frame headers the checksum contains the framecode byte and all
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
598 following bytes upto the checksum itself
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
599
17792
fd980f31fbc2 header_checksum
michael
parents: 17773
diff changeset
600 header_checksum
fd980f31fbc2 header_checksum
michael
parents: 17773
diff changeset
601 checksum over the startcode and forward pointer
fd980f31fbc2 header_checksum
michael
parents: 17773
diff changeset
602
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
603 Syncpoint tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
604 ---------------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
605
17439
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
606 back_ptr_div8
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
607 back_ptr = back_ptr_div8 * 8 + 7
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
608 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
609 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
610 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
611 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
612
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
613 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
614
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
615 global_key_pts
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
616 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
617 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
618
f6e39517d5b6 cosmetic change, shift stuff around to more logical places
ods15
parents: 17438
diff changeset
619 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
620 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
621
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
622 Index tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
623 -----------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
624
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
625 max_pts
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
626 The highest pts in the entire file
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
627
17438
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
628 syncpoint_pos_div8
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
629 offset from begginning of file to up to 7 bytes before the syncpoint
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
630 referred to in this index entry. Relative to position of last
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
631 syncpoint.
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
632
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
633 has_keyframe
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
634 indicates whether this stream has a keyframe between this syncpoint and
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
635 the last syncpoint.
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
636
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
637 keyframe_pts
81d2f40ce5d4 change goals slightly..
ods15
parents: 17437
diff changeset
638 The pts of the first keyframe for this stream in the region between the
17531
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
639 2 syncpoints, in the stream's timebase. (EOR frames are also keyframes)
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
640
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
641 eor_pts
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
642 Coded only if EOR is set at the position of the syncpoint. The pts of
c6ad2343ec16 EOR in index
ods15
parents: 17491
diff changeset
643 that EOR. EOR is unset by the first keyframe after it.
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
644
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
645 index_ptr
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
646 Length in bytes of the entire index, from the first byte of the
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
647 startcode until the last byte of the checksum.
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
648 Note: A demuxer can use this to find the index when it is written at
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
649 EOF, as index_ptr will always be 12 bytes before the end of file if
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
650 there is an index at all.
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
651
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
652
17640
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
653 Info tags:
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
654 ----------
6b69c5b4b92a more cosmetics
ods15
parents: 17639
diff changeset
655
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
656 stream_id_plus1
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
657 Stream this info packet applies to. If zero, packet applies to whole
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
658 file.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
659
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
660 chapter_id
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
661 Id of chapter this packet applies to. If zero, packet applies to whole
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
662 file. Positive chapter_id's are real chapters and MUST NOT overlap.
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
663 Negative chapter_id indicate a sub region of file and not a real
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
664 chapter. chapter_id MUST be unique to the region it represents.
17711
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
665 chapter_id n MUST not be used unless there are at least n chapters in the
8aa18d8e5eb6 add forward_ptr to syncpoint (+0.006% overhead)
michael
parents: 17710
diff changeset
666 file
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
667
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
668 chapter_start
17796
6edc4492b777 universal timestamp (= stream_id + timestamp in stream timebase)
michael
parents: 17795
diff changeset
669 timestamp of start of chapter
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
670
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
671 chapter_len
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
672 Length of chapter in same timebase of chapter_start.
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
673
9323
774afe44f17b some more info (copy & pasted from ML)
michael
parents: 9312
diff changeset
674 type
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
675 for example: "UTF8" -> string or "JPEG" -> JPEG image
17685
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
676 "v" -> unsigned integer
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
677 "s" -> signed integer
ac0534e8c3d2 use short 'type' names
ods15
parents: 17684
diff changeset
678 "r" -> rational
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
679 Note: nonstandard fields should be prefixed by "X-"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
680 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
681
13308
8ff17d153414 info packet is now file global, while meta pakcet is stream specific, as discussed with Rich
alex
parents: 13047
diff changeset
682 info packet types
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
683 the name of the info entry, valid names are
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
684 "Author"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
685 "Description"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
686 "Copyright"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
687 "Encoder"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
688 the name & version of the software used for encoding
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
689 "Title"
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
690 "Cover" (allowed types are "PNG" and "JPEG")
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
691 image of the (CD, DVD, VHS, ..) cover (preferably PNG or JPEG)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
692 "Source"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
693 "DVD", "VCD", "CD", "MD", "FM radio", "VHS", "TV", "LD"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
694 Optional: appended PAL, NTSC, SECAM, ... in parentheses
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
695 "CaptureDevice"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
696 "BT878", "BT848", "webcam", ... (more exact names are fine too)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
697 "CreationTime"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
698 "2003-01-20 20:13:15Z", ...
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
699 (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
700 Note: do not forget the timezone
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
701 "Keywords"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
702 "Language"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
703 ISO 639 and ISO 3166 for language/country code
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
704 something like "eng" (US english), can be 0 if unknown
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
705 and "multi" if several languages
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
706 see http://www.loc.gov/standards/iso639-2/englangn.html
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
707 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
708 the language code
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
709 "Disposition"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
710 "original", "dub" (translated), "comment", "lyrics", "karaoke"
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
711 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
712 can add them to the official standard (if they are sane)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
713 Note: nonstandard fields should be prefixed by "X-"
17686
eadca2812177 cosmetic, trailing whitespace
ods15
parents: 17685
diff changeset
714 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
715 meaning exists in English
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
716 Note: MUST be less than 64 bytes long
9295
michael
parents: 9294
diff changeset
717
michael
parents: 9294
diff changeset
718 value
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
719 value of this name/type pair
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
720
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
721 stuffing
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
722 0x80 can be placed in front of any type v entry for stuffing purposes
17797
b1d80d05eaa8 limit stuffing to prevent header_checksum from endup being useless due to a gb of 0x80 after a 'N'
michael
parents: 17796
diff changeset
723 except the forward_ptr and all fields in the frame header where a
b1d80d05eaa8 limit stuffing to prevent header_checksum from endup being useless due to a gb of 0x80 after a 'N'
michael
parents: 17796
diff changeset
724 maximum of 8 stuffing bytes per field are allowed
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
725
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
726
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
727 Structure:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
728 ----------
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
729
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
730 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
731 main header
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
732 stream_header (id=0)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
733 stream_header (id=1)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
734 ...
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
735 stream_header (id=n)
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
736
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
737 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
738 together and repeated headers MUST be identical
17547
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
739
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
740 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
741 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
742 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
743 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
744
17547
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
745 Note: this allows an implementation reading the file to locate backup
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
746 headers in O(log filesize) time as opposed to O(filesize)
114699930136 Allow headers to be repeated anywhere
ods15
parents: 17533
diff changeset
747
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
748 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
749 the index or at the file end if there is no index
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
750 headers MUST be repeated at least twice (so they exist three times in a file)
9295
michael
parents: 9294
diff changeset
751
16685
diego
parents: 16574
diff changeset
752 there MUST be a sync point immediately before the first frame after any headers
12503
a160a68209ac disposition
michael
parents: 12502
diff changeset
753
16842
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 Index:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
756 ------
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
757
15008
0a43341c8bfd less amateurish-looking mpcf.txt patch by (Jeff >snacky ikaruga co uk<)
michael
parents: 14919
diff changeset
758 Note: with realtime streaming, there is no end, so no index there either
17533
86a9a60ef596 Index repetition
ods15
parents: 17532
diff changeset
759 Index MAY only be repeated after main headers.
17726
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
760 If an index is written anywhere in the file, it MUST be written at end of
541738aa3079 return index_ptr to inside index
ods15
parents: 17723
diff changeset
761 file as well.
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
762
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
763
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
764 Info:
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
765 -----
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
766
17771
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
767 If a info packet is stored anywhere then a muxer MUST also store an identical
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
768 info packet after every main-stream-header set
9310
b16480522be9 some typos
michael
parents: 9307
diff changeset
769
17771
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
770 If a demuxer has seen several info packets with the same chapter_id and
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
771 stream_id then it MUST ignore all but the one with the highest position in
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
772 the file
17669
cb73482267a0 info packet stuff, chapters...
ods15
parents: 17653
diff changeset
773
17771
af02066c0706 remove info streams
michael
parents: 17730
diff changeset
774 demxuxers SHOULD not search the whole file for info packets
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
775
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
776 demuxer (non-normative):
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
777 ------------------------
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
778
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
779 in the absence of a valid header at the beginning, players SHOULD search for
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
780 backup headers starting at offset 2^x; for each x players SHOULD end their
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
781 search at a particular offset when any startcode is found (including syncpoint)
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
782
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
783
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
784
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
785 Semantic requirements:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
786 ======================
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
787
17018
baf593fcf738 Change MUST to SHOULD have disposition and if applicable language tags.
al
parents: 16843
diff changeset
788 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
789 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
790 It often highly improves usability and is therefore strongly encouraged.
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
791
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
792 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
793 is wrapped in a structure to facilitate more than one stream or otherwise
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
794 duplicate the role of a container. any such file is to be considered invalid.
17798
2d02868030f0 double muxing examples (cant hurt to explictly mention the most common)
michael
parents: 17797
diff changeset
795 for example vorbis in ogg in nut is invalid, as is
2d02868030f0 double muxing examples (cant hurt to explictly mention the most common)
michael
parents: 17797
diff changeset
796 mpegvideo+mpegaudio in mpeg-ps/ts in nut or dvvideo + dvaudio in dv in nut
16429
84174804804b Updates to NUT spec:
ods15
parents: 16428
diff changeset
797
12501
cd0d9a99b730 remove index flag
michael
parents: 12428
diff changeset
798
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
799
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
800 Sample code (Public Domain, & untested):
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
801 ========================================
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
802
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
803 typedef BufferContext{
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
804 uint8_t *buf;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
805 uint8_t *buf_ptr;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
806 }BufferContext;
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
807
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
808 static inline uint64_t get_bytes(BufferContext *bc, int count){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
809 uint64_t val=0;
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 assert(count>0 && count<9);
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
812
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
813 for(i=0; i<count; i++){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
814 val <<=8;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
815 val += *(bc->buf_ptr++);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
816 }
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 return val;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
819 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
820
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
821 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
822 uint64_t val=0;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
823
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
824 assert(count>0 && count<9);
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
825
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
826 for(i=count-1; i>=0; i--){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
827 *(bc->buf_ptr++)= val >> (8*i);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
828 }
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 val;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
831 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
832
10061
76b1c7d20da8 corrected the sample code
alex
parents: 9580
diff changeset
833 static inline uint64_t get_v(BufferContext *bc){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
834 uint64_t val= 0;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
835
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
836 for(; space_left(bc) > 0; ){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
837 int tmp= *(bc->buf_ptr++);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
838 if(tmp&0x80)
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
839 val= (val<<7) + tmp - 0x80;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
840 else
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
841 return (val<<7) + tmp;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
842 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
843
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
844 return -1;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
845 }
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
846
10061
76b1c7d20da8 corrected the sample code
alex
parents: 9580
diff changeset
847 static inline int put_v(BufferContext *bc, uint64_t val){
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
848 int i;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
849
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
850 if(space_left(bc) < 9) return -1;
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
851
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
852 val &= 0x7FFFFFFFFFFFFFFFULL; // FIXME can only encode upto 63 bits currently
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
853 for(i=7; ; i+=7){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
854 if(val>>i == 0) break;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
855 }
9294
7159ed6a4d0b nonsense (MPlayer container format draft 0.01)
michael
parents:
diff changeset
856
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
857 for(i-=7; i>0; i-=7){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
858 *(bc->buf_ptr++)= 0x80 | (val>>i);
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
859 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
860 *(bc->buf_ptr++)= val&0x7F;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
861
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
862 return 0;
9579
89d27a306886 *signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents: 9422
diff changeset
863 }
89d27a306886 *signed int vlc (needs only 5 lines of code so its no increase of complexity)
michael
parents: 9422
diff changeset
864
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
865 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
866 if(reset) memset(pts_cache, -1, delay*sizeof(int64_t));
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
867
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
868 while(delay--){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
869 int64_t t= pts_cache[delay];
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
870 if(t < pts){
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
871 pts_cache[delay]= pts;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
872 pts= t;
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
873 }
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
874 }
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
875
16686
93d4be7ef83e cosmetic reformatting: tabs --> spaces, prettyprinting, trailing whitespace
diego
parents: 16685
diff changeset
876 return pts;
12333
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
877 }
80036bf4a9f5 remove frame types
michael
parents: 12297
diff changeset
878
16842
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
879
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
880
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
881 Authors:
d977560c702b Reformat section titles so that it becomes easier to tell sections and
diego
parents: 16686
diff changeset
882 ========
10158
93e5428d0b3e some changes (michael: is the colorspace_type field needed?)
alex
parents: 10061
diff changeset
883
16428
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
884 Folks from the MPlayer developers mailing list (http://www.mplayerhq.hu/).
5f4317692b7c spelling/grammar/wording
diego
parents: 15755
diff changeset
885 Authors in alphabetical order: (FIXME! Tell us if we left you out)
16843
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
886 Beregszaszi, Alex (alex@fsn.hu)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
887 Bunkus, Moritz (moritz@bunkus.org)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
888 Diedrich, Tobias (ranma+mplayer@tdiedrich.de)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
889 Felker, Rich (dalias@aerifal.cx)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
890 Franz, Fabian (FabianFranz@gmx.de)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
891 Gereoffy, Arpad (arpi@thot.banki.hu)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
892 Hess, Andreas (jaska@gmx.net)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
893 Niedermayer, Michael (michaelni@gmx.at)
21fa9b28ca75 author list prettyprinting
diego
parents: 16842
diff changeset
894 Shimon, Oded (ods15@ods15.dyndns.org)