[xiph-commits] r3517 - in standards/roe: . examples
silvia at svn.annodex.net
silvia at svn.annodex.net
Sat Mar 22 06:56:42 PDT 2008
Author: silvia
Date: 2008-03-22 06:56:41 -0700 (Sat, 22 Mar 2008)
New Revision: 3517
Modified:
standards/roe/examples/roe_example1.xml
standards/roe/examples/roe_example2.xml
standards/roe/examples/roe_example3.xml
standards/roe/roe_1_0.xsd
Log:
The examples were all wrong: they used audio, video, text instead of mediaSource.
The ROE specification needed an inline attribute.
It now also needs an implementation. :-)
Modified: standards/roe/examples/roe_example1.xml
===================================================================
--- standards/roe/examples/roe_example1.xml 2008-03-20 21:45:57 UTC (rev 3516)
+++ standards/roe/examples/roe_example1.xml 2008-03-22 13:56:41 UTC (rev 3517)
@@ -5,18 +5,18 @@
<body>
<track id="v" provides="video">
<seq>
- <video id="v0" src="http://example.com/video.ogv" content-type="video/ogg" />
- <video id="v1" src="http://example.com/theora.ogv?track=v1" content-type="video/theora" />
+ <mediaSource id="v0" src="http://example.com/video.ogv" content-type="video/ogg" />
+ <mediaSource id="v1" src="http://example.com/theora.ogv?track=v1" content-type="video/theora" />
</seq>
</track>
<track id="a" provides="audio">
- <audio id="a1" src="http://example.com/theora.ogv?track=a1" content-type="audio/vorbis" />
+ <mediaSource id="a1" src="http://example.com/theora.ogv?track=a1" content-type="audio/vorbis" />
</track>
<track id="t" provides="caption">
- <text src="http://example.com/cmml1.cmml" content-type="text/cmml" />
+ <mediaSource src="http://example.com/cmml1.cmml" content-type="text/cmml" />
</track>
<track id="t2" provides="ticker">
- <text src="http://example.com/cmml2.cmml" content-type="text/cmml" />
+ <mediaSource src="http://example.com/cmml2.cmml" content-type="text/cmml" />
</track>
</body>
</ROE>
\ No newline at end of file
Modified: standards/roe/examples/roe_example2.xml
===================================================================
--- standards/roe/examples/roe_example2.xml 2008-03-20 21:45:57 UTC (rev 3516)
+++ standards/roe/examples/roe_example2.xml 2008-03-22 13:56:41 UTC (rev 3517)
@@ -5,15 +5,15 @@
<body>
<track id="v" provides="video">
<seq>
- <video id="v0" src="http://example.com/video.ogv" content-type="video/ogg" />
- <video id="v1" src="http://example.com/theora.ogv?track=v1" content-type="video/theora" />
+ <mediaSource id="v0" src="http://example.com/video.ogv" content-type="video/ogg" />
+ <mediaSource id="v1" src="http://example.com/theora.ogv?track=v1" content-type="video/theora" />
</seq>
</track>
<track id="a" provides="audio">
- <audio id="a1" src="http://example.com/theora.ogv?track=a1" content-type="audio/vorbis" />
+ <mediaSource id="a1" src="http://example.com/theora.ogv?track=a1" content-type="audio/vorbis" />
</track>
<track id="t1" provides="caption">
- <text src="http://example.com/cmml1.cmml" content-type="text/cmml" >
+ <mediaSource src="http://example.com/cmml1.cmml" inline="true" content-type="text/cmml" >
<cmml role="caption" xmlns:cmml="http://www.annodex.org/spec/cmml/cmml40">
<cmml:head>
<cmml:title>random 1</cmml:title>
@@ -24,10 +24,10 @@
</cmml:body>
</cmml:clip>
</cmml>
- </text>
+ </mediaSource>
</track>
<track id="t2" provides="ticker">
- <text src="http://example.com/cmml2.cmml" content-type="text/cmml" >
+ <mediaSource src="http://example.com/cmml2.cmml" inline="true" content-type="text/cmml" >
<cmml role="ticker" xmlns:cmml="http://www.annodex.org/spec/cmml/cmml40">
<cmml:head>
<cmml:title>random 2</cmml:title>
Modified: standards/roe/examples/roe_example3.xml
===================================================================
--- standards/roe/examples/roe_example3.xml 2008-03-20 21:45:57 UTC (rev 3516)
+++ standards/roe/examples/roe_example3.xml 2008-03-22 13:56:41 UTC (rev 3517)
@@ -8,51 +8,51 @@
<body>
<track id="v" provides="video">
<switch distinction="angle">
- <video id="v1" content-type="video/theora"
+ <mediaSource id="v1" content-type="video/theora"
src="http://example.com/angle1.ogv?track=v1&t=t1/t2" />
- <video id="v2" content-type="video/theora" src="http://example.com/angle2.ogv" />
+ <mediaSource id="v2" content-type="video/theora" src="http://example.com/angle2.ogv" />
</switch>
</track>
<track id="a" provides="audio">
<switch distinction="language">
<switch distinction="bitrate">
- <audio id="a1b1" lang="en" content-type="audio/vorbis"
+ <mediaSource id="a1b1" lang="en" content-type="audio/vorbis"
src="http://example.com/lang1b1.oga" />
- <audio id="a1b2" lang="en" content-type="audio/vorbis"
+ <mediaSource id="a1b2" lang="en" content-type="audio/vorbis"
src="http://example.com/lang1b2.oga" />
</switch>
- <audio id="a2" lang="de" content-type="audio/vorbis"
+ <mediaSource id="a2" lang="de" content-type="audio/vorbis"
src="http://example.com/lang2.oga" />
<seq>
- <audio id="a3" lang="fr" content-type="audio/vorbis"
+ <mediaSource id="a3" lang="fr" content-type="audio/vorbis"
src="http://example.com/lang3.oga" />
- <audio id="a4" lang="fr" content-type="audio/vorbis"
- src="http://example.com/lang3a.org" />
+ <mediaSource id="a4" lang="fr" content-type="audio/vorbis"
+ src="http://example.com/lang3a.oga" />
</seq>
</switch>
</track>
<track id="t" provides="text overlay">
<switch distinction="language">
- <text id="t1" lang="en" content-type="text/cmml"
+ <mediaSource id="t1" lang="en" content-type="text/cmml"
src="http://example.com/transcript1.cmml" />
- <text id="t2" lang="de" content-type="text/cmml"
+ <mediaSource id="t2" lang="de" content-type="text/cmml"
src="http://example.com/transcript2.cmml" />
- <text id="t3" lang="fr" content-type="text/cmml"
+ <mediaSource id="t3" lang="fr" content-type="text/cmml"
src="http://example.com/transcript3.cmml" />
</switch>
</track>
<track id="cc" provides="closed caption">
<switch distinction="language">
- <text id="cc1" lang="en" content-type="text/cmml" src="http://example.com/cc1.cmml" />
- <text id="cc2" lang="de" content-type="text/cmml" src="http://example.com/cc2.cmml" />
- <text id="cc3" lang="fr" content-type="text/cmml" src="http://example.com/cc3.cmml" />
+ <mediaSource id="cc1" lang="en" content-type="text/cmml" src="http://example.com/cc1.cmml" />
+ <mediaSource id="cc2" lang="de" content-type="text/cmml" src="http://example.com/cc2.cmml" />
+ <mediaSource id="cc3" lang="fr" content-type="text/cmml" src="http://example.com/cc3.cmml" />
</switch>
</track>
<track id="l" provides="logo">
<seq>
- <video id="O1" content-type="application/ogg"
+ <mediaSource id="O1" content-type="application/ogg"
src="http://example.com/mng.ogx?track=1" />
- <video id="O2" content-type="application/ogg"
+ <mediaSource id="O2" content-type="application/ogg"
src="http://example.com/mng.ogx?track=2" />
</seq>
</track>
Modified: standards/roe/roe_1_0.xsd
===================================================================
--- standards/roe/roe_1_0.xsd 2008-03-20 21:45:57 UTC (rev 3516)
+++ standards/roe/roe_1_0.xsd 2008-03-22 13:56:41 UTC (rev 3517)
@@ -16,8 +16,6 @@
Namespace = http://www.xiph.org/roe1.0
XHTML1.0 can be found here: http://www.w3.org/TR/xhtml1-schema/
- SMIL2.1 can be found here: http://www.w3.org/TR/SMIL2/smil-DTD.html
- (SMIL3 DTD or Schema don't exist yet)
For further information, see: http://www.annodex.net/
@@ -128,7 +126,8 @@
<xs:annotation>
<xs:documentation>
=================== Document Head ===============================
- head tag containing description of a specific timed text track
+ head tag containing generic description of the ROE file, including
+ track profiles
i18n = the base language of the head's attribute values and text
content
</xs:documentation>
@@ -270,6 +269,7 @@
</xs:sequence>
<xs:attribute name="content-type" type="xs:string" use="required" fixed="audio/vorbis" />
<xs:attribute name="src" type="xs:string" use="required" />
+ <xs:attribute name="inline" type="xs:boolean" defualt="false" />
<xs:attributeGroup ref="html:i18n" />
<xs:attribute name="id" type="xs:ID" use="required" />
<xs:attribute name="start" type="Timestamp"/>
More information about the commits
mailing list