Changeset 406:31a03b808483 in verona

Timestamp:

Jan 17, 2012 4:20:56 PM (16 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

[mq]: reinvite

Location:

phapi

Files:

• phapi.c (modified) (27 diffs)
• phapi.h (modified) (1 diff)
• phms.c (modified) (1 diff)
• phms.h (modified) (1 diff)
• phms_audiostream.c (modified) (3 diffs)
• phms_videostream.c (modified) (1 diff)

phapi/phapi.c

@@ -125 +125 @@
 static char *ph_get_call_contact(phcall_t *ca);
 
-#define MEDIA_SUSPEND
-
-#ifndef PH_STREAM_AUDIO
+//#define MEDIA_SUSPEND
+
+/*#ifndef PH_STREAM_AUDIO
 #define PH_STREAM_AUDIO (1 << 0)
 #define PH_STREAM_VIDEO_RX (1 << 1)
 #define PH_STREAM_VIDEO_TX (1 << 2)
-#endif
+#endif*/
 
 #define PH_STREAM_CNG (1 << 30)
@@ -188 +188 @@
 static int ph_call_media_stop(phcall_t * ca);
 static int ph_call_media_suspend(phcall_t *ca, int localhold);
+
+enum ph_direction
+{
+        sendrecv,
+        sendonly,
+        recvonly,
+        inactive
+};
+
+enum ph_direction ph_get_media_direction( sdp_message_t * sdp, const char * media_type);
+enum ph_direction ph_get_local_media_direction( phcall_t *ca, const char * media_type);
+int ph_set_media_direction( sdp_message_t * sdp, const char *media_type, enum ph_direction direction);
+const char * ph_get_str_direction( enum ph_direction direction);
 
 #define nonempty(x)  ((x) && (x)[0])
@@ -1205 +1218 @@
         int pos = 0;
 
-        if (!_is_audio_enabled(ca->nego_mflags))
+        if (!_is_audio_enabled(ca->user_mflags))
                 return 0;
 
@@ -1246 +1259 @@
         struct vline* vl;
 
-        if (!_is_video_enabled(ca->nego_mflags))
+        if (!_is_video_enabled(ca->user_mflags))
                 return 0;
 
@@ -2918 +2931 @@
 }
 
-PHAPI_EXPORT int
-phResumeCall(int cid)
-{
-        phcall_t *ca;
+int _ph_send_reinvite(int cid)
+{
         int i;
         osip_message_t *reinvite;
-        char *body;
-
+        phcall_t *ca;
+                
         if (!phIsInitialized)
                 return -PH_NOTINIT;
-
+                                                
         ca = ph_locate_call_by_cid(cid);
-
+                                                        
         if (!ca)
                 return -PH_BADCID;
-
-        if (!ca->localhold)
-                return -PH_HOLDERR;
-
-#ifndef CONF_MODE
-        if (ph_has_active_calls())
-                return -PH_NORESOURCES;
-#endif
-
-        ca->localhold = 0;
-        ca->localresume = 1;
-
+        
         eXosip_lock();
         if (eXosip_call_build_request(ca->did, "INVITE", &reinvite)) {
@@ -2952 +2952 @@
         eXosip_unlock();
 
-        osip_message_set_subject(reinvite, "Call resuming");
+        osip_message_set_subject(reinvite, "Call reinvite");
         osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
-
-        body = ph_call_fix_media_dir(ca, "sendrecv");
-        if (!body)
-                return -PH_HOLDERR;
-        if (body)
-                ph_req_set_body(reinvite, body, "application/sdp");
-
+                
+        sdp_context_build_offer(ca->sdpctx);
+
+        ph_set_media_direction(ca->sdpctx->offer, "audio", ph_get_local_media_direction(ca, "audio"));
+        ph_set_media_direction(ca->sdpctx->offer, "video", ph_get_local_media_direction(ca, "video"));
+
+        sdp_message_to_str(ca->sdpctx->offer, &ca->sdpctx->offerstr);
+
+        ca->local_sdp = ca->sdpctx->offer;
+        ca->remote_sdp = 0; // force ph_call_media_start on ph_call_answered
+        ph_req_set_body(reinvite, ca->sdpctx->offerstr, "application/sdp");
 
         eXosip_lock();
@@ -2966 +2970 @@
         eXosip_unlock();
 
+        osip_mutex_lock(ph_media_stop_mutex);
+        ph_call_media_stop(ca);
+        osip_mutex_unlock(ph_media_stop_mutex);
+
         return i;
+}                                                                                       
+
+PHAPI_EXPORT int
+phResumeCall(int cid)
+{
+        phcall_t *ca;
+
+        if (!phIsInitialized)
+                return -PH_NOTINIT;
+
+        ca = ph_locate_call_by_cid(cid);
+
+        if (!ca)
+                return -PH_BADCID;
+
+        ca->nego_mflags |= PH_STREAM_AUDIO_RX;
+        ca->nego_mflags |= PH_STREAM_VIDEO_RX;
+        
+        ca->localhold = 0;      
+        ca->localresume = 1;
+                
+        return _ph_send_reinvite(cid);
 }
 
@@ -2973 +3003 @@
 {
         phcall_t *ca;
-        osip_message_t *reinvite;
-        int i;
-        char *body;
-
-        DBG_SIP_NEGO("SIP_NEGO: phHoldCall\n");
 
         if (!phIsInitialized)
@@ -2987 +3012 @@
                 return -PH_BADCID;
 
-        if (ca->localhold)
-                return -PH_HOLDERR;
-
+        ca->nego_mflags &= ~PH_STREAM_AUDIO_RX;
+        ca->nego_mflags &= ~PH_STREAM_VIDEO_RX;
+        
+        ca->localresume = 0;
         ca->localhold = 1;
-
-        eXosip_lock();
-        if (eXosip_call_build_request(ca->did, "INVITE", &reinvite)) {
-                eXosip_unlock();
-                return -1;
-        }
-        eXosip_unlock();
-
-        osip_message_set_subject(reinvite, "Call on hold");
-        osip_message_set_allow(reinvite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
-        body = ph_call_fix_media_dir(ca, "sendonly");
-        if (!body)
-                return -PH_HOLDERR;
-        if (body)
-                ph_req_set_body(reinvite, body, "application/sdp");
-
-        eXosip_lock();
-        i = eXosip_call_send_request(ca->did, reinvite);
-        eXosip_unlock();
-
-        osip_mutex_lock(ph_media_stop_mutex);
-        if (!i && ph_call_hasaudio(ca))
-        {
-#ifndef MEDIA_SUSPEND
-                ph_call_media_stop(ca);
-#else
-                ph_call_media_suspend(ca, 1);
-#endif
-        }
-        osip_mutex_unlock(ph_media_stop_mutex);
-        return i;
+                                                                                                                
+        return _ph_send_reinvite(cid);
 }
 
@@ -5106 +5103 @@
 ph_call_media_start(phcall_t *ca, eXosip_event_t *je, int flags, int resumeflag)
 {
-        int i = 0;
         int use_socket;
+        int result = 0;
         struct ph_msession_s *s = NULL;
         const char* ptime = getenv("EXOSIP_FORCE_PTIME");
@@ -5117 +5114 @@
 
         // cases when the invocation is ignored
-        if (phcfg.nomedia || ca->localhold || ca->remotehold)
+        if (phcfg.nomedia || ca->remotehold)
         {
                 return 0;
@@ -5140 +5137 @@
                 s->audio_conf = NULL;
                 s->activestreams = 0;
+                s->dtmfCallback = ph_wegot_dtmf;
+                s->endCallback = ph_stream_ended;
+                s->qosInfoCbk = ph_qos_info_cbk;
+                s->frameDisplayCbk =  ph_frame_display_cbk;
         }
         else
@@ -5163 +5164 @@
         s->newstreams = 0;
 
-        if ( // user accepts video and network accepts video
-                        (_is_video_enabled(ca->user_mflags))
-                        && ca->video_payload
-                        && ca->remote_sdp_video_ip[0]
-        )
-        {
-                // negociated flags (user+SDP) need to be IO
-                ca->nego_mflags = ca->nego_mflags | PH_STREAM_VIDEO_RX;
-                ca->nego_mflags = ca->nego_mflags | PH_STREAM_VIDEO_TX;
-
-                DBG_SIP_NEGO("will have video stream ip: %s payload=%d\n", ca->remote_sdp_video_ip, ca->video_payload);
-                DBG_SIP_NEGO("media flags may have changed: user= %d nego=%d\n", ca->user_mflags, ca->nego_mflags);
-        }
-        else
-        {
-                // video is not negociated
-                // it is necessary to remove VIDEO IO flags
-                ca->nego_mflags = ca->nego_mflags & ~PH_STREAM_VIDEO_RX;
-                ca->nego_mflags = ca->nego_mflags & ~PH_STREAM_VIDEO_TX;
-
-                DBG_SIP_NEGO("media flags may have changed: user= %d nego=%d\n", ca->user_mflags, ca->nego_mflags);
-        }
-
-        if ( _is_video_enabled(ca->nego_mflags) )
+        if ( _is_video_enabled(ca->nego_mflags) && ca->video_payload && ca->remote_sdp_video_ip[0] && osip_strcasecmp(ca->remote_sdp_video_ip, "0"))
         {
                 struct ph_mstream_params_s *msp = &s->streams[PH_MSTREAM_VIDEO1];
@@ -5195 +5173 @@
 
                 // define the traffic type of the stream
-                ttype = _is_video_enabled(ca->user_mflags);
+                ttype = _is_video_enabled(ca->nego_mflags);
                 if (ttype == (PH_STREAM_VIDEO_RX | PH_STREAM_VIDEO_TX))
                 {
@@ -5233 +5211 @@
 
                 // define the video callback
-                s->frameDisplayCbk =  ph_frame_display_cbk;
+                
 
                 // additional configuration for video
@@ -5245 +5223 @@
         }
 
-        if ( // audio is enabled
-                        _is_audio_enabled(ca->nego_mflags)
-                        && (!ca || ca->remote_sdp_audio_ip[0])
-        )
+        if (_is_audio_enabled(ca->nego_mflags) && ca->remote_sdp_audio_ip[0] && osip_strcasecmp(ca->remote_sdp_audio_ip, "0"))
         {
                 struct ph_mstream_params_s *msp = &s->streams[PH_MSTREAM_AUDIO1];
+                int ttype = 0;
 
                 //TODO uncomment it after the work un payloads
@@ -5269 +5245 @@
                 s->newstreams |= (1 << PH_MSTREAM_AUDIO1);
 
-                s->dtmfCallback = ph_wegot_dtmf;
-                s->endCallback = ph_stream_ended;
-                s->qosInfoCbk = ph_qos_info_cbk;
-
                 if (phcfg.vad & 0x80000000)
                 {
@@ -5291 +5263 @@
                 }
 
-                msp->traffictype = PH_MSTREAM_TRAFFIC_IO;
+                ttype = _is_audio_enabled(ca->nego_mflags);
+                if (ttype == (PH_STREAM_AUDIO_RX | PH_STREAM_AUDIO_TX))
+                {
+                        msp->traffictype = PH_MSTREAM_TRAFFIC_IO;
+                }
+                else if (ttype == PH_STREAM_AUDIO_RX)
+                {
+                        msp->traffictype = PH_MSTREAM_TRAFFIC_IN;
+                }
+                else if (ttype == PH_STREAM_AUDIO_TX)
+                {
+                        msp->traffictype = PH_MSTREAM_TRAFFIC_OUT;
+                }
+                
                 msp->localport = ca->loc_sdp_audio_port;
 
@@ -5336 +5321 @@
 
         // take action depending on the streaming configuration
-        if (s->newstreams | s->activestreams)
-        {
-                if (resumeflag)
-                {
-                        if (ph_msession_resume(s, PH_MSTREAM_TRAFFIC_IO, phcfg.audio_dev_in, phcfg.audio_dev_out, use_socket))
-                        {
-                                DBG_SIP_NEGO("SIP_NEGO:ph_call_media_start: just called ph_msession_resume\n");
-                                i = -PH_NOMEDIA;
-                        }
-                }
-                else if (ph_msession_start(s, ca->audiodev_in, ca->audiodev_out, use_socket))
+        if (s->newstreams || s->activestreams)
+        {
+                if (ph_msession_start(s, ca->audiodev_in, ca->audiodev_out, use_socket))
                 {
                         DBG_SIP_NEGO("SIP_NEGO:ph_call_media_start: just called ph_msession_start\n");
-                        i = -PH_NOMEDIA;
+                        result = -PH_NOMEDIA;
                 }
         }
@@ -5355 +5332 @@
         {
                 DBG_SIP_NEGO("SIP_NEGO:ph_call_media_start: nothing to start\n");
-                i = -PH_NOMEDIA;
+                result = -PH_NOMEDIA;
         }
 
         osip_mutex_unlock(ph_media_start_mutex);
 
-        return i;
+        return result;
 }
 
@@ -5568 +5545 @@
         info.remoteSdp = sdp = ph_req_get_body(je->response);
 
-        if (!ca->localhold)
+        //if (!ca->localhold)
         {
                 const int mflags =  -1 & ~(PH_STREAM_MCSEND|PH_STREAM_MCRECV);
@@ -5588 +5565 @@
                                         DBG_SIP_NEGO("ph_call_answered: different sdp restarting streams\n");
                                 }
-                                ph_call_media_stop(ca);
                                 sdp_message_free(ca->remote_sdp);
                         }
+                        ph_call_media_stop(ca);
                         ca->remote_sdp = new_sdp;
                         ca->sdpctx->answer = ca->remote_sdp;
+                        osip_list_special_free(&ca->result_audio_payloads, sdp_payload_free);
+                        osip_list_special_free(&ca->result_video_payloads, sdp_payload_free);
                         sdp_context_process_answer(ca->sdpctx, ca->remote_sdp);
                         ph_call_retrieve_payloads(ca, -1);
-
+        
+                        ph_update_nego_mflags(ca,ph_get_media_direction(new_sdp,"audio"),ph_get_media_direction(new_sdp,"video"));
+        
                         if (ph_call_media_start(ca, je, mflags, ca->localresume))
                         {
@@ -5685 +5666 @@
         rca = ph_locate_call_by_cid(ca->rcid);
 
-        if (ca && !ca->localrefer)
+        if (ca && !ca->localrefer && !ca->localhold && !ca->localresume)
         {
                 ph_call_retrieve_payloads(ca, PH_STREAM_CNG);
@@ -6176 +6157 @@
 
         info.vlid = ca->vlid;
-        if (ph_call_hasaudio(ca) || ph_call_hasvideo(ca))
+        /*if (ph_call_hasaudio(ca) || ph_call_hasvideo(ca))
         {
 #ifndef MEDIA_SUSPEND
@@ -6183 +6164 @@
                 ph_call_media_suspend(ca, 0);
 #endif
-        }
+        }*/
 
         ca->remotehold = 1;
@@ -6211 +6192 @@
         ca->remotehold = 0;
 
-        if (ph_call_hasaudio(ca) || ph_call_hasvideo(ca)) {
+        /*if (ph_call_hasaudio(ca) || ph_call_hasvideo(ca)) {
                 ph_call_retrieve_payloads(ca, -1);
                 ph_call_media_resume(ca, !remotehold);
-        }
+        }*/
 
         if (remotehold) {
@@ -6229 +6210 @@
 #define keywordcmp(key,str)  strncmp(key,str,strlen(key))
 
-void
+int ph_set_media_direction( sdp_message_t * sdp, const char *media_type, enum ph_direction direction)
+{
+        int mline =0;
+        
+        for (mline=0; !sdp_message_endof_media (sdp, mline); mline++) 
+        {
+                const char * mtype = sdp_message_m_media_get(sdp, mline);
+                if(!osip_strcasecmp(media_type, mtype))
+                {
+                        const char * sdir = ph_get_str_direction(direction);
+                        sdp_message_a_attribute_del(sdp, mline, "inactive");
+                        sdp_message_a_attribute_del(sdp, mline, "sendonly");
+                        sdp_message_a_attribute_del(sdp, mline, "sendrecv");
+                        sdp_message_a_attribute_add(sdp, mline, osip_strdup(sdir), 0);
+                        
+                        return 0;
+                }
+        }
+        return -1;
+}
+
+enum ph_direction ph_get_local_media_direction( phcall_t *ca, const char * media_type)
+{
+        if(!osip_strcasecmp(media_type, "audio"))
+        {
+                if(ca->nego_mflags & PH_STREAM_AUDIO_TX &&  ca->nego_mflags & PH_STREAM_AUDIO_RX)
+                        return sendrecv;
+                if(ca->nego_mflags & PH_STREAM_AUDIO_TX)
+                        return sendonly;
+                if(ca->nego_mflags & PH_STREAM_AUDIO_RX)
+                        return recvonly;
+        }
+        else if(!osip_strcasecmp(media_type, "video"))
+        {
+                if(ca->nego_mflags & PH_STREAM_VIDEO_TX && ca->nego_mflags & PH_STREAM_VIDEO_RX)
+                        return sendrecv;
+                if(ca->nego_mflags & PH_STREAM_VIDEO_TX)
+                        return sendonly;
+                if(ca->nego_mflags & PH_STREAM_VIDEO_RX)
+                        return recvonly;
+        }
+        
+        return inactive;
+}
+
+enum ph_direction ph_get_media_direction( sdp_message_t * sdp, const char * media_type)
+{
+        int mline = 0;
+        for (mline=0; !sdp_message_endof_media (sdp, mline); mline++) 
+        {
+                int i =0;
+                sdp_attribute_t *attr;
+                const char * mtype = sdp_message_m_media_get(sdp, mline);
+                if(!osip_strcasecmp(media_type, mtype))
+                {
+                        for (i=0;(attr=sdp_message_attribute_get(sdp,mline,i))!=NULL;i++) 
+                        {
+                                if ( keywordcmp("sendrecv",attr->a_att_field) == 0 )
+                                {
+                                        return sendrecv;
+                                }
+                                else if( keywordcmp("sendonly",attr->a_att_field) == 0 )
+                                {
+                                        return sendonly;
+                                }
+                                else if( keywordcmp("recvonly",attr->a_att_field) == 0 )
+                                {
+                                        return recvonly;
+                                }
+                                else if( keywordcmp("inactive",attr->a_att_field) == 0 )
+                                {
+                                        return inactive;
+                                }
+                        }
+                        
+                        return sendrecv;
+                }
+        }
+        return inactive;
+}
+
+int ph_update_nego_mflags( phcall_t *ca, enum ph_direction remote_audio_direction, enum ph_direction remote_video_direction)
+{
+        switch(remote_audio_direction)
+        {
+                case sendrecv:
+                        ca->nego_mflags |= PH_STREAM_AUDIO;
+                break;
+                
+                case sendonly:
+                        ca->nego_mflags &= ~PH_STREAM_AUDIO_TX;
+                        //ca->nego_mflags |= PH_STREAM_AUDIO_RX;
+                break;
+                
+                case recvonly:
+                        ca->nego_mflags &= ~PH_STREAM_AUDIO_RX;
+                        ca->nego_mflags |= PH_STREAM_AUDIO_TX;
+                break;
+                
+                case inactive:
+                        ca->nego_mflags &= ~PH_STREAM_AUDIO;
+                break;
+        }
+        
+        switch(remote_video_direction)
+        {
+                case sendrecv:
+                        ca->nego_mflags |= PH_STREAM_VIDEO;
+                break;
+                
+                case sendonly:
+                        ca->nego_mflags &= ~PH_STREAM_VIDEO_TX;
+                        //ca->nego_mflags |= PH_STREAM_VIDEO_RX;
+                break;
+                
+                case recvonly:
+                        ca->nego_mflags &= ~PH_STREAM_VIDEO_RX;
+                        ca->nego_mflags |= PH_STREAM_VIDEO_TX;
+                break;
+                
+                case inactive:
+                        ca->nego_mflags &= ~PH_STREAM_VIDEO;
+                break;
+        }
+        
+        return 0;
+}
+
+const char * ph_get_str_direction( enum ph_direction direction) 
+{
+        switch(direction)
+        {
+                case sendrecv:
+                        return "sendrecv";
+                break;
+                
+                case sendonly:
+                        return "sendonly";
+                break;
+                
+                case recvonly:
+                        return "recvonly";
+                break;
+                
+                case inactive:
+                        return "inactive";
+                break;
+        }
+        
+        return "";
+}
+
+int
 ph_call_reinvite(eXosip_event_t *je)
 {
-        int is_sendrec = 0;
+        int i = 0;
+        int isHeld = 0;
         int mline = 0;
-        sdp_message_t * msg = eXosip_get_sdp_info(je->request);
-
-        for (mline=0; !sdp_message_endof_media (msg, mline); mline++) {
-                int i;
-                sdp_attribute_t *attr;
-                const char * mtype = sdp_message_m_media_get(msg, mline);
-                if (strcasecmp("audio", mtype) == 0){
-                        //is audio
-                }
-                /*else if (strcasecmp("video", mtype) == 0){
-                        //is video
-                }*/
-                else
-                        continue;
-
-                for (i=0;(attr=sdp_message_attribute_get(msg,mline,i))!=NULL;i++) {
-                        if (keywordcmp("sendrecv",attr->a_att_field)==0){
-                                is_sendrec = 1;
-                        }/*else if (keywordcmp("sendonly",attr->a_att_field)==0){
-                                is_sendrec = 0;
-                        }else if (keywordcmp("recvonly",attr->a_att_field)==0){
-                                is_sendrec = 0;
-                        }else if (keywordcmp("inactive",attr->a_att_field)==0){
-                                is_sendrec = 0;
-                        }*/
-                }
-                break;
-        }
-
-        ph_answer_request(je->cid, je->tid, 200, 0);
-
-        if(is_sendrec)
+        phcall_t *ca = 0;
+        sdp_message_t * sdp = 0;
+        struct vline *vl;
+        osip_message_t *msg = 0;
+        char *body = NULL;
+        struct ph_msession_s * msession;
+        
+        ca = ph_locate_call(je, 0);
+
+        if (!ca)
+                return -PH_BADCID;
+                
+        vl = ph_valid_vlid(ca->vlid);
+
+        if (!vl)
+                return -PH_BADVLID;
+                
+        msession = ca->mses;
+                
+        sdp = eXosip_get_sdp_info(je->request);
+                
+        ca->sdpctx->offer = ca->remote_sdp = sdp;
+        
+        i = eXosip_call_build_answer(ca->tid, 200, &msg);
+        if (i < 0)
+        {
+                return -1;
+        }
+                
+        osip_list_special_free(&ca->result_audio_payloads, sdp_payload_free);
+        osip_list_special_free(&ca->result_video_payloads, sdp_payload_free);
+        
+        if (sdp_context_build_answer(ca->sdpctx, ca->remote_sdp, phcfg.ptime) == NULL)
+        {
+                eXosip_call_send_answer(ca->tid, 606, NULL); //error, no matching payload
+                eXosip_unlock();
+                return -1;
+        }
+        
+        ph_call_media_stop(ca); 
+        ph_update_nego_mflags(ca, ph_get_media_direction(sdp,"audio"), ph_get_media_direction(sdp,"video"));
+        ph_set_media_direction(ca->sdpctx->answer, "audio", ph_get_local_media_direction(ca, "audio"));
+        ph_set_media_direction(ca->sdpctx->answer, "video", ph_get_local_media_direction(ca, "video"));
+        
+        if (ca->sdpctx->answerstr!=NULL) {
+                osip_free(ca->sdpctx->answerstr);
+                ca->sdpctx->answerstr = 0;
+        }
+        
+        sdp_message_to_str(ca->sdpctx->answer, &ca->sdpctx->answerstr);
+
+        ca->local_sdp = ca->sdpctx->answer;
+        ph_req_set_body(msg, ca->sdpctx->answerstr, "application/sdp");
+        i = eXosip_call_send_answer(ca->tid, 200, msg);
+        ph_call_media_start(ca, je, 0, 0);
+/*
+        if(isHeld)
+                ph_call_onhold(je);
+        else
                 ph_call_offhold(je);
-        else
-        ph_call_onhold(je);
+*/                      
+        return 0;
 }
 

phapi/phapi.h

@@ -162 +162 @@
 #define PH_SOCK_MODE_UDP 0
 #define PH_SOCK_MODE_HTTP_TUNNEL 1
-#define PH_STREAM_AUDIO (1 << 0)
-#define PH_STREAM_VIDEO_RX (1 << 1)
-#define PH_STREAM_VIDEO_TX (1 << 2)
+//#define PH_STREAM_AUDIO (1 << 0)
+
+#define PH_STREAM_AUDIO_RX (1 << 1)
+#define PH_STREAM_AUDIO_TX (1 << 2)
+#define PH_STREAM_AUDIO (PH_STREAM_AUDIO_RX|PH_STREAM_AUDIO_TX)
+#define PH_STREAM_VIDEO_RX (1 << 3)
+#define PH_STREAM_VIDEO_TX (1 << 4)
 #define PH_STREAM_VIDEO (PH_STREAM_VIDEO_RX|PH_STREAM_VIDEO_TX)
-#define PH_OVERRIDE_AUDIO_ADDR (1 << 3)
-#define PH_OVERRIDE_VIDEO_ADDR (1 << 4)
-#define PH_NOMEDIA_STREAMS (1 << 5)
-#define PH_STREAM_DATA (1 << 6)
-#define PH_STREAM_MCSEND (1 << 7)
-#define PH_STREAM_MCRECV (1 << 8)
-#define PH_ANONYMOUS_CALL (1 << 9)
-#define PH_NORTCP_ATTR (1 << 10)
-#define PH_USE_RFC5626 (1 << 11)
-#define PH_NOEARLY_MEDIA (1 << 12)
+#define PH_OVERRIDE_AUDIO_ADDR (1 << 5)
+#define PH_OVERRIDE_VIDEO_ADDR (1 << 6)
+#define PH_NOMEDIA_STREAMS (1 << 7)
+#define PH_STREAM_DATA (1 << 8)
+#define PH_STREAM_MCSEND (1 << 9)
+#define PH_STREAM_MCRECV (1 << 10)
+#define PH_ANONYMOUS_CALL (1 << 11)
+#define PH_NORTCP_ATTR (1 << 12)
+#define PH_USE_RFC5626 (1 << 13)
+#define PH_NOEARLY_MEDIA (1 << 14)
 
 typedef struct _phStream

phapi/phms.c

@@ -195 +195 @@
                         video1->profile = make_profile(&av_profile, video1);
                 }
-                switch(video1->traffictype)
-                {
-                case PH_MSTREAM_TRAFFIC_IO:
-                        ret = phms_video_stream_start(video, video1->profile, video1->remoteaddr,video1->remoteport,video1->remoteport+1,video1->ipayloads[0].number,video1->jitter, s);
-                        break;
-                case PH_MSTREAM_TRAFFIC_OUT:
-                        ret = phms_video_stream_start_send_only(video, video1->profile, video1->remoteaddr,video1->remoteport,video1->remoteport+1,video1->ipayloads[0].number,video1->jitter, s);
-                        break;
-                case PH_MSTREAM_TRAFFIC_IN:
-                        ret = phms_video_stream_start_receive_only(video, video1->profile, video1->remoteaddr,video1->remoteport,video1->remoteport+1,video1->ipayloads[0].number,video1->jitter, s);
-                        break;
-                }
+                
+                ret = phms_video_stream_start(video, video1->profile, video1->remoteaddr,video1->remoteport,video1->remoteport+1,video1->ipayloads[0].number,video1->jitter, s);
         }
 #endif

phapi/phms.h

@@ -179 +179 @@
         /* bit mask of active streams */
         int    activestreams;
-
+        
         /* bit mask of new streams to be activated */
         int    newstreams;

phapi/phms_audiostream.c

@@ -536 +536 @@
         RtpSession *rtps;
         char *infile = 0, *outfile=0;
+        struct ph_msession_s *s = ms;
+        struct ph_mstream_params_s *audio1 = &s->streams[PH_MSTREAM_AUDIO1];
 
 #ifdef ENABLE_PORTAUDIO
@@ -541 +543 @@
 #endif
 
-        if ((infile = strstr(device_in,"INFILE=")) != NULL)
-        {
-                infile = infile + 7;
-                if (infile == NULL)
-                        return NULL;
-        }
-        else
-        {
-                capt_sndcard=phms_get_read_soundcard(device_in);
-        }
-        if ((outfile = strstr(device_out,"OUTFILE=")) != NULL)
-        {
-                outfile = outfile + 8;
-                if (outfile == NULL)
-                        return NULL;
-        }
-        else
-        {
-                play_sndcard=phms_get_write_soundcard(device_out);
+        if(audio1->traffictype == PH_MSTREAM_TRAFFIC_OUT || audio1->traffictype == PH_MSTREAM_TRAFFIC_IO)
+        {
+                if ((infile = strstr(device_in,"INFILE=")) != NULL)
+                {
+                        infile = infile + 7;
+                        if (infile == NULL)
+                                return NULL;
+                }
+                else
+                {
+                        capt_sndcard=phms_get_read_soundcard(device_in);
+                }
+        }
+        
+        if(audio1->traffictype == PH_MSTREAM_TRAFFIC_IN || audio1->traffictype == PH_MSTREAM_TRAFFIC_IO)
+        {
+                if ((outfile = strstr(device_out,"OUTFILE=")) != NULL)
+                {
+                        outfile = outfile + 8;
+                        if (outfile == NULL)
+                                return NULL;
+                }
+                else
+                {
+                        play_sndcard=phms_get_write_soundcard(device_out);
+                }
         }
 
@@ -662 +671 @@
 {
         audio_display_stats(stream->session);
+        
+        rtp_session_signal_disconnect_by_callback(stream->session, "qos_event",  (RtpCallback) phms_on_qos_change);
+        rtp_session_signal_disconnect_by_callback(stream->session,"telephone-event",(RtpCallback)phms_on_dtmf_received);
+        rtp_session_signal_disconnect_by_callback(stream->session,"rtcp_packet",(RtpCallback)rtp_session_rtcp_parse);
 
         if (stream->ticker){

phapi/phms_videostream.c

@@ -416 +416 @@
 {
         MSWebCam *cam = phms_get_webcam();
+        struct ph_msession_s *s = msession;
+        struct ph_mstream_params_s *video1 = &s->streams[PH_MSTREAM_VIDEO1];
         
         if(cam != NULL)
         {
-                #if 0
-                        return(phms_video_stream_start_full(pvs,profile,remip,remport,rem_rtcp_port,payload,jitt_comp,cam,msession));
-                #else
-                        VideoStream * stream = pvs->s;
-                        video_stream_set_render_callback(stream,phapiVideoStreamRenderCallback,(void*)msession);
+                VideoStream * stream = pvs->s;
+                video_stream_set_render_callback(stream,phapiVideoStreamRenderCallback,(void*)msession);
+                if (video1->traffictype == PH_MSTREAM_TRAFFIC_IO ) 
+                {
                         return video_stream_start(stream,profile,remip,remport,rem_rtcp_port,payload,jitt_comp,cam);
-                #endif
+                }
+                else if(video1->traffictype == PH_MSTREAM_TRAFFIC_IN)
+                {
+                        return video_stream_recv_only_start(stream,profile,remip,remport,payload,jitt_comp);
+                }
+                else if(video1->traffictype == PH_MSTREAM_TRAFFIC_OUT)
+                {
+                        return video_stream_send_only_start(stream,profile,remip,remport,rem_rtcp_port,payload,jitt_comp,cam);
+                }
         }               
-        else
-                return -1;
+        
+        return -1;
 }
 int phms_video_stream_start_send_only(phms_video_stream_t *pvs, RtpProfile *profile, const char *remip, int remport,int rem_rtcp_port, int payload, int jitt_comp, void *msession)