fix the rest of the attribute lists
Showing
1 changed file
with
10 additions
and
5 deletions
... | @@ -135,7 +135,8 @@ mediaURL | ... | @@ -135,7 +135,8 @@ mediaURL |
135 | / ! tag file:[ -~]+ { return file.join(''); } | 135 | / ! tag file:[ -~]+ { return file.join(''); } |
136 | 136 | ||
137 | keyAttributes | 137 | keyAttributes |
138 | = attrs:keyAttribute+ | 138 | = attrs:(keyAttribute (attrSeparator streamInfAttrs)*) |
139 | / attrs:keyAttribute? | ||
139 | 140 | ||
140 | keyAttribute | 141 | keyAttribute |
141 | = "METHOD" "=" method:keyMethod | 142 | = "METHOD" "=" method:keyMethod |
... | @@ -150,7 +151,8 @@ keyMethod | ... | @@ -150,7 +151,8 @@ keyMethod |
150 | / "SAMPLE-AES" | 151 | / "SAMPLE-AES" |
151 | 152 | ||
152 | mediaAttributes | 153 | mediaAttributes |
153 | = attrs:mediaAttribute+ | 154 | = attrs:(mediaAttribute (attrSeparator mediaAttribute)*) |
155 | / attrs:mediaAttribute? | ||
154 | 156 | ||
155 | mediaAttribute | 157 | mediaAttribute |
156 | = "TYPE" "=" type:mediaTypes | 158 | = "TYPE" "=" type:mediaTypes |
... | @@ -184,21 +186,24 @@ streamInfSharedAttr | ... | @@ -184,21 +186,24 @@ streamInfSharedAttr |
184 | / "VIDEO" "=" video:quotedString | 186 | / "VIDEO" "=" video:quotedString |
185 | 187 | ||
186 | mapAttributes | 188 | mapAttributes |
187 | = attrs:mapAttribute+ | 189 | = attrs:(mapAttribute (attrSeparator mapAttribute)*) |
190 | / attrs:mapAttribute? | ||
188 | 191 | ||
189 | mapAttribute | 192 | mapAttribute |
190 | = "URI" "=" uri:quotedString | 193 | = "URI" "=" uri:quotedString |
191 | / "BYTERANGE" "=" byteRange:quotedString | 194 | / "BYTERANGE" "=" byteRange:quotedString |
192 | 195 | ||
193 | iframeStreamAttrs | 196 | iframeStreamAttrs |
194 | = iframeStreamAttr+ | 197 | = attrs:(iframeStreamAttr (attrSeparator iframeStreamAttr)*) |
198 | / attrs:iframeStreamAttr? | ||
195 | 199 | ||
196 | iframeStreamAttr | 200 | iframeStreamAttr |
197 | = streamInfSharedAttr | 201 | = streamInfSharedAttr |
198 | / "URI" "=" uri:quotedString | 202 | / "URI" "=" uri:quotedString |
199 | 203 | ||
200 | startAttributes | 204 | startAttributes |
201 | = attrs:startAttribute+ | 205 | = attrs:(startAttribute (attrSeparator startAttribute)*) |
206 | / attrs:startAttribute? | ||
202 | 207 | ||
203 | startAttribute | 208 | startAttribute |
204 | = "TIME-OFFSET" "=" timeOffset:number | 209 | = "TIME-OFFSET" "=" timeOffset:number | ... | ... |
-
Please register or sign in to post a comment