[telepathy-spec/master] Handler: move handler capability tokens into the defining interface (which is MediaSignalling, in practice)
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Aug 5 10:21:04 PDT 2009
---
spec/Channel_Interface_Media_Signalling.xml | 74 ++++++++++++++++++++++++++
spec/Client_Handler.xml | 75 +-------------------------
2 files changed, 77 insertions(+), 72 deletions(-)
diff --git a/spec/Channel_Interface_Media_Signalling.xml b/spec/Channel_Interface_Media_Signalling.xml
index 5c29316..0df05f9 100644
--- a/spec/Channel_Interface_Media_Signalling.xml
+++ b/spec/Channel_Interface_Media_Signalling.xml
@@ -152,6 +152,80 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</tp:property>
+ <tp:handler-capability-token name="gtalk-p2p">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>The client can implement streaming for streams whose <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
+ property is <code>gtalk-p2p</code>.</p>
+ </tp:docstring>
+ </tp:handler-capability-token>
+
+ <tp:handler-capability-token name="ice-udp">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>The client can implement streaming for streams whose <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
+ property is <code>ice-udp</code>.</p>
+ </tp:docstring>
+ </tp:handler-capability-token>
+
+ <tp:handler-capability-token name="wlm-8.5">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>The client can implement streaming for streams whose <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
+ property is <code>wlm-8.5</code>.</p>
+ </tp:docstring>
+ </tp:handler-capability-token>
+
+ <tp:handler-capability-token name="wlm-2009">
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ <p>The client can implement streaming for streams whose <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
+ property is <code>wlm-2009</code>.</p>
+ </tp:docstring>
+ </tp:handler-capability-token>
+
+ <tp:handler-capability-token name="video/h264" is-family="yes">
+ <tp:docstring>
+ <p>The client supports media streaming with H264 (etc.).</p>
+
+ <p>This handler capability token is a one of a family
+ of similar tokens: for any other audio or video codec whose MIME
+ type is audio/<em>subtype</em> or video/<em>subtype</em>, a handler
+ capability token of this form may exist (the subtype MUST appear
+ in lower case in this context). Clients MAY support more
+ codecs than they explicitly advertise support for; clients SHOULD
+ explicitly advertise support for their preferred codec(s), and
+ for codecs like H264 that are, in practice, significant in codec
+ negotiation.</p>
+
+ <tp:rationale>
+ <p>For instance, the XMPP capability used by the Google Video
+ Chat web client to determine whether a client is compatible
+ with it requires support for H264 video, so an XMPP
+ connection manager that supports this version of Jingle should
+ not advertise the Google Video Chat capability unless there
+ is at least one installed client that declares that it supports
+ <code>video/h264</code> on StreamedMedia channels.</p>
+ </tp:rationale>
+
+ <p>[FIXME: should we say the next paragraph, for completeness?]</p>
+
+ <p>Clients supporting video MUST advertise support for at least
+ one video codec, while clients supporting audio MUST advertise
+ support for at least one audio codec.</p>
+
+ <p>For example, a client could advertise support for
+ Speex, Theora and H264 by having three
+ handler capability tokens,
+ <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/audio/speex</code>,
+ <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/theora</code> and
+ <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264</code>,
+ in its <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Client.Handler">Capabilities</tp:dbus-ref>
+ property.</p>
+ </tp:docstring>
+ </tp:handler-capability-token>
+
</interface>
</node>
<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml
index 06b490b..d791f44 100644
--- a/spec/Client_Handler.xml
+++ b/spec/Client_Handler.xml
@@ -125,78 +125,9 @@
different.
</tp:rationale>
- <p>An initial set of client capabilities is defined here: when this
- interface leaves draft status, these capabilities should be defined
- by the MediaSignalling interface.</p>
-
- <dl>
-
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p</dt>
- <dd>
- <p>The client can implement streaming for streams whose <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
- property is <code>gtalk-p2p</code>.</p>
- </dd>
-
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp</dt>
- <dd>
- <p>The client can implement streaming for streams whose <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
- property is <code>ice-udp</code>.</p>
- </dd>
-
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/wlm-8.5</dt>
- <dd>
- <p>The client can implement streaming for streams whose <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
- property is <code>wlm-8.5</code>.</p>
- </dd>
-
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/wlm-2009</dt>
- <dd>
- <p>The client can implement streaming for streams whose <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Media.StreamHandler">NATTraversal</tp:dbus-ref>
- property is <code>wlm-2009</code>.</p>
- </dd>
-
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/audio/<em>SUBTYPE</em></dt>
- <dt>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/<em>SUBTYPE</em></dt>
- <dd>
- <p>The client supports media streaming with the audio or video codec
- whose MIME type is audio/<em>SUBTYPE</em> or
- video/<em>SUBTYPE</em> (the subtype MUST appear in lower
- case when used with this interface). Clients MAY support more
- codecs than they explicitly advertise support for; clients SHOULD
- explicitly advertise support for their preferred codec(s), and
- for codecs that are, in practice, significant in codec
- negotiation.</p>
-
- <tp:rationale>
- <p>For instance, the XMPP capability used by the Google Video
- Chat web client to determine whether a client is compatible
- with it requires support for H264 video, so an XMPP
- connection manager that supports this version of Jingle should
- not advertise the Google Video Chat capability unless there
- is at least one installed client that declares that it supports
- <code>video/h264</code> on StreamedMedia channels.</p>
- </tp:rationale>
-
- <p>[FIXME: should we say the next paragraph, for completeness?]</p>
-
- <p>Clients supporting video MUST advertise support for at least
- one video codec, while clients supporting audio MUST advertise
- support for at least one audio codec.</p>
-
- <p>For example, a client could advertise support for
- Speex, Theora and H264 by having three
- Feature flags,
- <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/audio/speex</code>,
- <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/theora</code> and
- <code>org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264</code>.
- .</p>
- </dd>
-
- </dl>
+ <p>So far, all client capabilities are defined by the <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Channel.Interface">MediaSignalling</tp:dbus-ref>
+ interface.</p>
</tp:docstring>
</tp:simple-type>
--
1.5.6.5
More information about the telepathy-commits
mailing list