Changeset 8506

Timestamp:

08/19/07 21:07:49 (17 months ago)

Author:

liori

Message:

Jingle: a try with popen()ing external file for p2p connection

Location:

branches/jingle/src/common

Files:

• jingle-handler.py (added)
• jingle.popen.py (copied) (copied from branches/jingle/src/common/jingle.py) (7 diffs)

branches/jingle/src/common/jingle.popen.py

@@ -15 +15 @@
 import gajim
 import xmpp
-
-# ugly hack
-import sys, dl, gst
+import gobject
+
+import sys, dl, gst, gobject
 sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL)
 import farsight
-sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_LOCAL)
+
 
 import meta
@@ -75 +75 @@
                 }
 
-                # for making streams using farsight
-                import gc
-                gc.disable()
-                print self.weinitiate, "#farsight_session_factory_make"
-                self.p2psession = farsight.farsight_session_factory_make('rtp')
-                self.p2psession.connect('error', self.on_p2psession_error)
-
         ''' Middle-level functions to manage contents. Handle local content
         cache and send change notifications. '''
@@ -380 +373 @@
                 JingleContent.__init__(self, session, node)
                 self.got_codecs = False
+                self.codecs = []
 
                 #if node is None:
@@ -418 +412 @@
                         if 'channels' in codec: c['channels']=codec['channels']
                         codecs.append(c)
+                        self.p2pin.write('%d %d %s %d %d %d\n' % (1, farsight.MEDIA_TYPE_AUDIO,
+                                codec['encoding_name'], codec['id'], codec['clock_rate'], codec['channels']))
                 if len(codecs)==0: return
 
                 print self.session.weinitiate, "#farsight_stream_set_remote_codecs"
-                self.p2pstream.set_remote_codecs(codecs)
+                #self.p2pstream.set_remote_codecs(codecs)
+                self.p2pin.write('%d %d %s %d %d %d\n' % (1, farsight.MEDIA_TYPE_AUDIO,
+                        'LAST', 0, 0, 0))
                 self.got_codecs=True
 
@@ -445 +443 @@
                         if 'pwd' in candidate: cand['password']=candidate['pwd']
 
+                        self.p2pin.write('%d %d %s %s %d %s %s\n' % (0, int(candidate['type']), candidate['cid'], candidate['ip'], int(candidate['port']), candidate['ufrag'], candidate['pwd']))
                         candidates.append(cand)
                 print self.session.weinitiate, "#add_remote_candidate"
-                self.p2pstream.add_remote_candidate(candidates)
+                #self.p2pstream.add_remote_candidate(candidates)
 
         def toXML(self):
@@ -464 +463 @@
                         payload=payload)
 
+        def new_data(self, *things):
+                buf = self.p2pout.readline()
+                print "RECV: %r"%buf
+                msg = buf.split(' ')
+                try:
+                        type = int(msg.pop(0))
+                except:
+                        return True
+                #print msg
+                if type==0:
+                        media_type, id, ip, port, username, password = msg[:6]
+                        media_type=int(media_type)
+                        port=int(port)
+                        #print "Received %d %s %s %d %s %s" % (media_type, id, ip, port, username, password)
+                        self.send_candidate({'candidate_id': id, 'component': 1, 'ip': ip,
+                                'port': port, 'username': username, 'password': password,
+                                'proto': farsight.NETWORK_PROTOCOL_UDP, 'proto_subtype': 'RTP',
+                                'proto_profile': 'AVP', 'preference': 1.0, 'type': 0})
+                elif type==1:
+                        media_type, encoding_name, pt, clock_rate, channels=msg[:5]
+                        media_type=int(media_type)
+                        pt=int(pt)
+                        clock_rate=int(clock_rate)
+                        channels=int(channels)
+
+                        #print "Received %d %s %d %d %d" % (media_type, encoding_name, pt, clock_rate, channels)
+                        if encoding_name!='LAST':
+                                self.codecs.append((media_type, encoding_name, pt, clock_rate, channels))
+                        else:
+                                self.got_codecs=True
+                return True
+
         def setupStream(self):
+                import popen2
+                self.p2pout, self.p2pin = popen2.popen2('/home/liori/Projekty/SoC/trunk/src/common/jingle-handler.py')
+                gobject.io_add_watch(self.p2pout, gobject.IO_IN, self.new_data)
+                while not self.got_codecs:
+                        self.new_data()
+                return
                 print self.session.weinitiate, "#farsight_session_create_stream"
                 self.p2pstream = self.session.p2psession.create_stream(
@@ -548 +585 @@
 
         def iterCodecs(self):
-                print self.session.weinitiate, "#farsight_stream_get_local_codecs"
-                codecs=self.p2pstream.get_local_codecs()
-                for codec in codecs:
-                        a = {'name': codec['encoding_name'],
-                             'id': codec['id'],
-                             'channels': 1}
-                        if 'clock_rate' in codec: a['clockrate']=codec['clock_rate']
-                        if 'optional_params' in codec:
-                                p = (xmpp.Node('parameter', {'name': name, 'value': value})
-                                     for name, value in codec['optional_params'].iteritems())
-                        else:   p = ()
-                        yield xmpp.Node('payload-type', a, p)
+                for codec in self.codecs:
+                        media_type, encoding_name, pt, clock_rate, channels=codec
+                        yield xmpp.Node('payload-type', {
+                                'name': encoding_name,
+                                'id': pt,
+                                'channels': channels,
+                                'clock_rate': clock_rate})
+                
+#               print self.session.weinitiate, "#farsight_stream_get_local_codecs"
+#               codecs=self.p2pstream.get_local_codecs()
+#               for codec in codecs:
+#                       a = {'name': codec['encoding_name'],
+#                            'id': codec['id'],
+#                            'channels': 1}
+#                       if 'clock_rate' in codec: a['clockrate']=codec['clock_rate']
+#                       if 'optional_params' in codec:
+#                               p = (xmpp.Node('parameter', {'name': name, 'value': value})
+#                                    for name, value in codec['optional_params'].iteritems())
+#                       else:   p = ()
+#                       yield xmpp.Node('payload-type', a, p)
 
 class ConnectionJingle(object):