Changeset 4757 for pjproject

Timestamp:

Feb 21, 2014 7:53:31 AM (11 years ago)

Author:

nanang

Message:

Re #1708: Fixed missing conference port connection setups for audio conferencing.

Location:

pjproject/trunk/pjsip-apps/src/pygui

Files:

• call.py (modified) (1 diff)
• chat.py (modified) (4 diffs)
• chatgui.py (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pygui/call.py

@@ -71 +71 @@
                                         self.chat.addMessage(None, "'%s' sets call active" % (self.peerUri))
                                         self.onhold = False
+                if self.chat:
+                        self.chat.updateCallMediaState(self, ci)
                         
         def onInstantMessage(self, prm):

pjproject/trunk/pjsip-apps/src/pygui/chat.py

@@ -141 +141 @@
                                 
                         # send via call, if any, or buddy
-                        sender = None
+                        target = None
                         if self._callList[idx] and self._callList[idx].connected:
-                                sender = self._callList[idx]
+                                target = self._callList[idx]
                         else:
-                                sender = self._buddyList[idx]
-                        assert(sender)
+                                target = self._buddyList[idx]
+                        assert(target)
                                 
                         try:
-                                sender.sendTypingIndication(type_ind_param)
+                                target.sendTypingIndication(type_ind_param)
                         except:
                                 pass
@@ -163 +163 @@
                                 
                         # send via call, if any, or buddy
-                        sender = None
+                        target = None
                         if self._callList[idx] and self._callList[idx].connected:
-                                sender = self._callList[idx]
+                                target = self._callList[idx]
                         else:
-                                sender = self._buddyList[idx]
-                        assert(sender)
+                                target = self._buddyList[idx]
+                        assert(target)
                         
                         try:
-                                sender.sendInstantMessage(send_im_param)
+                                target.sendInstantMessage(send_im_param)
                         except:
                                 # error will be handled via Account::onInstantMessageStatus()
@@ -303 +303 @@
                 elif info.state == pj.PJSIP_INV_STATE_CONFIRMED:
                         self._gui.audioUpdateState(thecall.peerUri, gui.AudioState.CONNECTED)
-                        med_idx = self._getActiveMediaIdx(thecall)
-                        si = thecall.getStreamInfo(med_idx)
-                        stats_str = "Audio codec: %s/%s\n..." % (si.codecName, si.codecClockRate)
-                        self._gui.audioSetStatsText(thecall.peerUri, stats_str)
+                        if not self.isPrivate():
+                                # inform peer about conference participants
+                                conf_welcome_str  = '\n---\n'
+                                conf_welcome_str += 'Welcome to the conference, participants:\n'
+                                conf_welcome_str += '%s (host)\n' % (self._acc.cfg.idUri)
+                                for p in self._participantList:
+                                        conf_welcome_str += '%s\n' % (str(p))
+                                conf_welcome_str += '---\n'
+                                send_im_param = pj.SendInstantMessageParam()
+                                send_im_param.content = conf_welcome_str
+                                try:
+                                        thecall.sendInstantMessage(send_im_param)
+                                except:
+                                        pass
+                                        
+                                # inform others, including self
+                                msg = "[Conf manager] %s has joined" % (thecall.peerUri)
+                                self.addMessage(None, msg)
+                                self._sendInstantMessage(msg, thecall.peerUri)
+                                
                 elif info.state == pj.PJSIP_INV_STATE_DISCONNECTED:
                         if info.lastStatusCode/100 != 2:
@@ -325 +341 @@
                         if not self.isPrivate():
                                 self.kickParticipant(ParseSipUri(thecall.peerUri))
+                                
+                                # inform others, including self
+                                msg = "[Conf manager] %s has left" % (thecall.peerUri)
+                                self.addMessage(None, msg)
+                                self._sendInstantMessage(msg, thecall.peerUri)
+
+        def updateCallMediaState(self, thecall, info = None):
+                # info is optional here, just to avoid calling getInfo() twice (in the caller and here)
+                if not info: info = thecall.getInfo()
+                
+                med_idx = self._getActiveMediaIdx(thecall)
+                if (med_idx < 0):
+                        self._gui.audioSetStatsText(thecall.peerUri, 'No active media')
+                        return
+
+                si = thecall.getStreamInfo(med_idx)
+                dir_str = ''
+                if si.dir == 0:
+                        dir_str = 'inactive'
+                else:
+                        if si.dir & pj.PJMEDIA_DIR_ENCODING:
+                                dir_str += 'send '
+                        if si.dir & pj.PJMEDIA_DIR_DECODING:
+                                dir_str += 'receive '
+                stats_str  = "Direction   : %s\n" % (dir_str)
+                stats_str += "Audio codec : %s (%sHz)" % (si.codecName, si.codecClockRate)
+                self._gui.audioSetStatsText(thecall.peerUri, stats_str)
+                m = pj.AudioMedia.typecastFromMedia(thecall.getMedia(med_idx))
+                
+                # make conference
+                for c in self._callList:
+                        if c == thecall:
+                                continue
+                        med_idx = self._getActiveMediaIdx(c)
+                        if med_idx < 0:
+                                continue
+                        mm = pj.AudioMedia.typecastFromMedia(c.getMedia(med_idx))
+                        m.startTransmit(mm)
+                        mm.startTransmit(m)
 
                         

pjproject/trunk/pjsip-apps/src/pygui/chatgui.py

@@ -258 +258 @@
                 
                 # stat
-                self.stat = tk.Text(self._callFrame, width=10, height=2, bg='lightgray', relief=tk.FLAT, font=("Arial", "9"))
+                self.stat = tk.Text(self._callFrame, width=10, height=2, bg='lightgray', relief=tk.FLAT, font=("Courier", "9"))
                 self.stat.insert(tk.END, 'stat here')
                 self.stat.pack(side=tk.BOTTOM, fill=tk.BOTH, expand=1)