Changeset 8493 for branches/jingle

Timestamp:

08/12/07 23:22:25 (16 months ago)

Author:

liori

Message:

Jingle: farsight bindings define constants now

Location:

branches/jingle/src/common

Files:

• farsight/farsightmodule.c (modified) (2 diffs)
• farsight/farsight.override (modified) (7 diffs)
• jingle.py (modified) (8 diffs)

branches/jingle/src/common/farsight/farsightmodule.c

@@ -1 +1 @@
 #include <pygobject.h>
 #include <stdio.h>
+
+#include <farsight/farsight-codec.h>
+#include <farsight/farsight-stream.h>
+#include <farsight/farsight-transmitter.h>
  
 void farsight_register_classes (PyObject *d); 
@@ -17 +21 @@
         farsight_register_classes (d);
  
-        // farsight_add_constants(m, 'FARSIGHT_TYPE_');
+        PyModule_AddIntConstant(m, "MEDIA_TYPE_AUDIO", FARSIGHT_MEDIA_TYPE_AUDIO);
+        PyModule_AddIntConstant(m, "MEDIA_TYPE_VIDEO", FARSIGHT_MEDIA_TYPE_VIDEO);
+        PyModule_AddIntConstant(m, "STREAM_DIRECTION_NONE", FARSIGHT_STREAM_DIRECTION_NONE);
+        PyModule_AddIntConstant(m, "STREAM_DIRECTION_SENDONLY", FARSIGHT_STREAM_DIRECTION_SENDONLY);
+        PyModule_AddIntConstant(m, "STREAM_DIRECTION_RECEIVEONLY", FARSIGHT_STREAM_DIRECTION_RECEIVEONLY);
+        PyModule_AddIntConstant(m, "STREAM_DIRECTION_BOTH", FARSIGHT_STREAM_DIRECTION_BOTH);
+        PyModule_AddIntConstant(m, "STREAM_STATE_DISCONNECTED", FARSIGHT_STREAM_STATE_DISCONNECTED);
+        PyModule_AddIntConstant(m, "STREAM_STATE_CONNECTING", FARSIGHT_STREAM_STATE_CONNECTING);
+        PyModule_AddIntConstant(m, "STREAM_STATE_CONNECTED", FARSIGHT_STREAM_STATE_CONNECTED);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_EOS", FARSIGHT_STREAM_ERROR_EOS);
+        PyModule_AddIntConstant(m, "STREAM_UNKNOWN_ERROR", FARSIGHT_STREAM_UNKNOWN_ERROR);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_UNKNOWN", FARSIGHT_STREAM_UNKNOWN_ERROR);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_TIMEOUT", FARSIGHT_STREAM_ERROR_TIMEOUT);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_NETWORK", FARSIGHT_STREAM_ERROR_NETWORK);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_PIPELINE_SETUP", FARSIGHT_STREAM_ERROR_PIPELINE_SETUP);
+        PyModule_AddIntConstant(m, "STREAM_ERROR_RESOURCE", FARSIGHT_STREAM_ERROR_RESOURCE);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_0", FARSIGHT_DTMF_EVENT_0);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_1", FARSIGHT_DTMF_EVENT_1);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_2", FARSIGHT_DTMF_EVENT_2);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_3", FARSIGHT_DTMF_EVENT_3);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_4", FARSIGHT_DTMF_EVENT_4);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_5", FARSIGHT_DTMF_EVENT_5);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_6", FARSIGHT_DTMF_EVENT_6);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_7", FARSIGHT_DTMF_EVENT_7);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_8", FARSIGHT_DTMF_EVENT_8);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_9", FARSIGHT_DTMF_EVENT_9);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_STAR", FARSIGHT_DTMF_EVENT_STAR);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_POUND", FARSIGHT_DTMF_EVENT_POUND);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_A", FARSIGHT_DTMF_EVENT_A);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_B", FARSIGHT_DTMF_EVENT_B);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_C", FARSIGHT_DTMF_EVENT_C);
+        PyModule_AddIntConstant(m, "DTMF_EVENT_D", FARSIGHT_DTMF_EVENT_D);
+        PyModule_AddIntConstant(m, "DTMF_METHOD_AUTO", FARSIGHT_DTMF_METHOD_AUTO);
+        PyModule_AddIntConstant(m, "DTMF_METHOD_RTP_RFC4733", FARSIGHT_DTMF_METHOD_RTP_RFC4733);
+        PyModule_AddIntConstant(m, "DTMF_METHOD_SOUND", FARSIGHT_DTMF_METHOD_SOUND);
+        PyModule_AddIntConstant(m, "TRANSMITTER_STATE_DISCONNECTED", FARSIGHT_TRANSMITTER_STATE_DISCONNECTED);
+        PyModule_AddIntConstant(m, "TRANSMITTER_STATE_CONNECTING", FARSIGHT_TRANSMITTER_STATE_CONNECTING);
+        PyModule_AddIntConstant(m, "TRANSMITTER_STATE_CONNECTED", FARSIGHT_TRANSMITTER_STATE_CONNECTED);
+        PyModule_AddIntConstant(m, "CANDIDATE_TYPE_LOCAL", FARSIGHT_CANDIDATE_TYPE_LOCAL);
+        PyModule_AddIntConstant(m, "CANDIDATE_TYPE_DERIVED", FARSIGHT_CANDIDATE_TYPE_DERIVED);
+        PyModule_AddIntConstant(m, "CANDIDATE_TYPE_RELAY", FARSIGHT_CANDIDATE_TYPE_RELAY);
+        PyModule_AddIntConstant(m, "NETWORK_PROTOCOL_UDP", FARSIGHT_NETWORK_PROTOCOL_UDP);
+        PyModule_AddIntConstant(m, "NETWORK_PROTOCOL_TCP", FARSIGHT_NETWORK_PROTOCOL_TCP);
 
         if (PyErr_Occurred ()) {

branches/jingle/src/common/farsight/farsight.override

@@ -105 +105 @@
         fti->type               = get_long_from_dict(dict, "type");
 
-        if (PyError_Occurred()) return;
+        if (PyErr_Occurred()) return;
 
         /* optional */
@@ -111 +111 @@
         fti->password           = get_str_from_dict(dict, "password");
 
-        PyError_Clear();
+        PyErr_Clear();
 }
 
@@ -125 +125 @@
         fc->encoding_name       = get_str_from_dict(dict, "encoding_name");
 
-        if (PyError_Occured()) return;
+        if (PyErr_Occurred()) return;
 
         /* optional data */
@@ -336 +336 @@
         }
 
-        if(!PyError_Occurred()) {
+        if(!PyErr_Occurred()) {
                 farsight_stream_set_remote_candidate_list(FARSIGHT_STREAM(self->obj), candidate_list);
         }
@@ -343 +343 @@
         g_list_free(candidate_list);
 
-        if(!PyError_Occurred()) {
+        if(!PyErr_Occurred()) {
                 Py_INCREF(Py_None);
                 return Py_None;
@@ -380 +380 @@
         }
 
-        if (!PyError_Occurred()) {
+        if (!PyErr_Occurred()) {
                 farsight_stream_set_remote_codecs(FARSIGHT_STREAM(self->obj), codecs_list);
         }
@@ -388 +388 @@
         g_list_free(codecs_list);
 
-        if (!PyError_Occurred()) {
+        if (!PyErr_Occurred()) {
                 Py_INCREF(Py_None);
                 return Py_None;

branches/jingle/src/common/jingle.py

@@ -21 +21 @@
 import farsight
 sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_LOCAL)
-FARSIGHT_MEDIA_TYPE_AUDIO=0
-FARSIGHT_STREAM_DIRECTION_BOTH=3
-FARSIGHT_NETWORK_PROTOCOL_UDP=0
-FARSIGHT_CANDIDATE_TYPE_LOCAL=0
 
 import meta
@@ -85 +81 @@
         ''' Middle-level functions to manage contents. Handle local content
         cache and send change notifications. '''
-        def addContent(self, name, content, initiator='we'):
+        def addContent(self, name, content, creator='we'):
                 ''' Add new content to session. If the session is active,
                 this will send proper stanza to update session. 
                 The protocol prohibits changing that when pending.
-                Initiator must be one of ('we', 'peer', 'initiator', 'responder')'''
+                Creator must be one of ('we', 'peer', 'initiator', 'responder')'''
                 if self.state==JingleStates.pending:
                         raise WrongState
 
-                if (initiator=='we' and self.weinitiate) or (initiator=='peer' and not self.weinitiate):
-                        initiator='initiator'
-                elif (initiator=='peer' and self.weinitiate) or (initiator=='we' and not self.weinitiate):
-                        initiator='responder'
-                content.creator = initiator
+                if (creator=='we' and self.weinitiate) or (creator=='peer' and not self.weinitiate):
+                        creator='initiator'
+                elif (creator=='peer' and self.weinitiate) or (creator=='we' and not self.weinitiate):
+                        creator='responder'
+                content.creator = creator
                 content.name = name
-                self.contents[(initiator,name)]=content
+                self.contents[(creator,name)]=content
 
                 if self.state==JingleStates.active:
@@ -118 +114 @@
 
         def sendSessionInfo(self): pass
-        def sendTransportInfo(self): pass
 
         ''' Callbacks. '''
@@ -166 +161 @@
                 self.initiator = jingle['initiator']
                 self.responder = self.ourjid
-                self.jid = self.initiator
+                self.peerjid = self.initiator
 
                 fail = True
@@ -256 +251 @@
                 assert self.state!=JingleStates.ended
 
-        def __transportInfo(self):
+        def sendTransportInfo(self, content):
                 assert self.state!=JingleStates.ended
+                stanza, jingle = self.__makeJingle('transport-info')
+                jingle.addChild(node=content)
+                self.connection.connection.send(stanza)
 
         '''Callbacks'''
@@ -369 +367 @@
                 return xmpp.Node(xmpp.NS_JINGLE_ICE_UDP+' transport')
 
-class JingleVoiP(object):
+class JingleContent(object):
+        ''' An abstraction of content in Jingle sessions. '''
+        def __init__(self, session, node=None):
+                self.session = session
+                # will be filled by JingleSession.add_content()
+                # don't uncomment these lines, we will catch more buggy code then
+                # (a JingleContent not added to session shouldn't send anything)
+                #self.creator = None
+                #self.name = None
+
+class JingleVoiP(JingleContent):
         ''' Jingle VoiP sessions consist of audio content transported
         over an ICE UDP protocol. '''
         __metaclass__=meta.VerboseClassType
         def __init__(self, session, node=None):
-                self.session = session
+                JingleContent.__init__(self, session, node)
                 self.codecs = None
 
@@ -393 +401 @@
                         ])
 
+        def __content(self, payload=[]):
+                ''' Build a XML content-wrapper for our data. '''
+                return xmpp.Node('content',
+                        attrs={'name': self.name, 'creator': self.creator, 'profile': 'RTP/AVP'},
+                        payload=payload)
+
         def setupStream(self):
-                self.p2pstream = self.session.p2psession.create_stream(FARSIGHT_MEDIA_TYPE_AUDIO, FARSIGHT_STREAM_DIRECTION_BOTH)
+                self.p2pstream = self.session.p2psession.create_stream(
+                        farsight.MEDIA_TYPE_AUDIO, farsight.STREAM_DIRECTION_BOTH)
                 self.p2pstream.set_property('transmitter', 'libjingle')
                 self.p2pstream.connect('error', self.on_p2pstream_error)
@@ -410 +425 @@
         def on_p2pstream_state_changed(self, *whatever): pass
         def on_p2pstream_new_native_candidate(self, p2pstream, candidate_id):
-                candidate = p2pstream.get_native_candidate(candidate_id)
-
+                candidates = p2pstream.get_native_candidate(candidate_id)
+
+                for candidate in candidates:
+                        attrs={
+                                'component': candidate['component'],
+                                'foundation': '1', # hack
+                                'generation': '0',
+                                'ip': candidate['ip'],
+                                'network': '0',
+                                'port': candidate['port'],
+                                'priority': int(100000*candidate['preference']), # hack
+                                'protocol': candidate['proto']==farsight.NETWORK_PROTOCOL_UDP and 'udp' or 'tcp',
+                        }
+                        if 'username' in candidate: attrs['ufrag']=candidate['username']
+                        if 'password' in candidate: attrs['pwd']=candidate['password']
+                        c=self.__content()
+                        t=c.addChild(xmpp.NS_JINGLE_ICE_UDP+' transport')
+                        t.addChild('candidate', attrs=attrs)
+                        self.session.sendTransportInfo(c)
 
         def getCodecs(self):