copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

workaround for psi, little fixes...

This commit is contained in:
Thibaut GIRKA 2009-09-27 22:56:09 +02:00
parent e141d7875a
commit 85195e99ad
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/jingle.py
View File

@ -119,7 +119,7 @@ class JingleSession(object):
'security-info': [self.__defaultCB], #TODO 'security-info': [self.__defaultCB], #TODO
'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB, 'session-accept': [self.__sessionAcceptCB, self.__contentAcceptCB,
self.__broadcastCB, self.__defaultCB], self.__broadcastCB, self.__defaultCB],
'session-info': [self.__sessionInfoCB, self.__broadcastCB], 'session-info': [self.__sessionInfoCB, self.__broadcastCB, self.__defaultCB],
'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB, 'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB,
self.__defaultCB], self.__defaultCB],
'session-terminate': [self.__sessionTerminateCB, self.__broadcastAllCB, 'session-terminate': [self.__sessionTerminateCB, self.__broadcastAllCB,
@ -359,6 +359,7 @@ class JingleSession(object):
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
def __sessionInfoCB(self, stanza, jingle, error, action): def __sessionInfoCB(self, stanza, jingle, error, action):
#TODO: ringing, active, (un)hold, (un)mute
payload = jingle.getPayload() payload = jingle.getPayload()
if len(payload) > 0: if len(payload) > 0:
self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info') self.__send_error(stanza, 'feature-not-implemented', 'unsupported-info')
@ -668,6 +669,7 @@ class JingleContent(object):
#self.creator = None #self.creator = None
#self.name = None #self.name = None
self.accepted = False self.accepted = False
self.sent = False
self.candidates = [] # Local transport candidates self.candidates = [] # Local transport candidates
self.senders = 'both' #FIXME self.senders = 'both' #FIXME
@ -697,7 +699,7 @@ class JingleContent(object):
def is_ready(self): def is_ready(self):
#print '[%s] %s, %s' % (self.media, self.candidates_ready, #print '[%s] %s, %s' % (self.media, self.candidates_ready,
# self.p2psession.get_property('codecs-ready')) # self.p2psession.get_property('codecs-ready'))
return (self.accepted and self.candidates_ready return (self.accepted and self.candidates_ready and not self.sent
and self.p2psession.get_property('codecs-ready')) and self.p2psession.get_property('codecs-ready'))
def stanzaCB(self, stanza, content, error, action): def stanzaCB(self, stanza, content, error, action):
@ -792,6 +794,8 @@ class JingleContent(object):
''' Add our things to session-initiate stanza. ''' ''' Add our things to session-initiate stanza. '''
self._fillContent(content) self._fillContent(content)
self.sent = True
if self.candidates and self.candidates[0].username and \ if self.candidates and self.candidates[0].username and \
self.candidates[0].password: self.candidates[0].password:
attrs = {'ufrag': self.candidates[0].username, attrs = {'ufrag': self.candidates[0].username,
@ -843,6 +847,9 @@ class JingleRTPContent(JingleContent):
self.p2psession = self.conference.new_session(self.farsight_media) self.p2psession = self.conference.new_session(self.farsight_media)
participant = self.conference.new_participant(self.session.peerjid) participant = self.conference.new_participant(self.session.peerjid)
#FIXME: Consider a workaround, here...
# pidgin and telepathy-gabble don't follow the XEP, and it won't work
# due to bad controlling-mode
params = {'controlling-mode': self.session.weinitiate,# 'debug': False} params = {'controlling-mode': self.session.weinitiate,# 'debug': False}
'stun-ip': '69.0.208.27', 'debug': False} 'stun-ip': '69.0.208.27', 'debug': False}
@ -968,12 +975,15 @@ class JingleVoIP(JingleRTPContent):
JingleRTPContent.setup_stream(self) JingleRTPContent.setup_stream(self)
# Configure SPEEX # Configure SPEEX
#FIXME: codec ID is an important thing for psi (and pidgin?) # Workaround for psi (not needed since rev
# So, if it doesn't work with pidgin or psi, LOOK AT THIS # 147aedcea39b43402fe64c533d1866a25449888a):
# place 16kHz before 8kHz, as buggy psi versions will take in
# account only the first codec
codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', codecs = [farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
farsight.MEDIA_TYPE_AUDIO, 8000), farsight.MEDIA_TYPE_AUDIO, 16000),
farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX', farsight.Codec(farsight.CODEC_ID_ANY, 'SPEEX',
farsight.MEDIA_TYPE_AUDIO, 16000)] farsight.MEDIA_TYPE_AUDIO, 8000)]
self.p2psession.set_codec_preferences(codecs) self.p2psession.set_codec_preferences(codecs)
# the local parts # the local parts