annotate DOCS/tech/nut.txt @ 19382:7c6c205b88b6

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