annotate DOCS/tech/nut.txt @ 20631:ec285c2d1055

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