[#1450] Add setRtpSessionMedia and setRtpSessionRemoteIp address

sflphone-common/src/audio/audiortp.cpp

@@ -106,6 +106,13 @@ AudioRtp::closeRtpSession () {
 }
 
 
+AudioRtpRTX*
+AudioRtp::getRTX()
+{
+    return _RTXThread;
+}
+
+
 void
 AudioRtp::setRecording() {
 
@@ -116,6 +123,8 @@ AudioRtp::setRecording() {
 
 
 
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // AudioRtpRTX Class                                                          //
 ////////////////////////////////////////////////////////////////////////////////
@@ -195,11 +204,16 @@ AudioRtpRTX::initBuffers()
     spkrDataDecoded = new SFLDataFormat[nbSamplesMax];
 }
 
+
     void
 AudioRtpRTX::initAudioRtpSession (void) 
 {
 
     try {
+
+        setRtpSessionMedia();
+
+        /*
         if (_ca == 0) { return; }
         _audiocodec = _ca->getLocalSDP()->get_session_media ();
 
@@ -208,7 +222,6 @@ AudioRtpRTX::initAudioRtpSession (void)
         _codecSampleRate = _audiocodec->getClockRate();
         _codecFrameSize = _audiocodec->getFrameSize();
 
-
         ost::InetHostAddress remote_ip(_ca->getLocalSDP()->get_remote_ip().c_str());
         _debug("Init audio RTP session %s\n", _ca->getLocalSDP()->get_remote_ip().data());
         if (!remote_ip) {
@@ -227,7 +240,11 @@ AudioRtpRTX::initAudioRtpSession (void)
             _session->setSchedulingTimeout(10000);
             _session->setExpireTimeout(1000000);
         }
+	*/
 
+	setRtpSessionRemoteIp();
+
+        /*
         if (!_sym) {
 	    if ( !_sessionRecv->addDestination(remote_ip, (unsigned short) _ca->getLocalSDP()->get_remote_audio_port()) ) {
                 _debug("AudioRTP Thread Error: could not connect to port %d\n",  _ca->getLocalSDP()->get_remote_audio_port());
@@ -263,6 +280,7 @@ AudioRtpRTX::initAudioRtpSession (void)
                 }
             }
         }
+	*/
 
 
     } catch(...) {
@@ -272,6 +290,84 @@ AudioRtpRTX::initAudioRtpSession (void)
 
 }
 
+void
+AudioRtpRTX::setRtpSessionMedia(void)
+{
+
+    _debug("setRtpSessionMedia()\n");
+
+    if (_ca == 0) { return; }
+
+    
+    _audiocodec = _ca->getLocalSDP()->get_session_media ();
+
+    if (_audiocodec == NULL) { return; }
+
+    _codecSampleRate = _audiocodec->getClockRate();
+    _codecFrameSize = _audiocodec->getFrameSize();
+
+    if (!_sym) {
+
+        bool payloadIsSet = false;
+        if (_audiocodec) {
+            if (_audiocodec->hasDynamicPayload()) {
+                payloadIsSet = _sessionRecv->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) _audiocodec->getPayload(), _audiocodec->getClockRate()));
+            } else {
+                payloadIsSet= _sessionRecv->setPayloadFormat(ost::StaticPayloadFormat((ost::StaticPayloadType) _audiocodec->getPayload()));
+                payloadIsSet = _sessionSend->setPayloadFormat(ost::StaticPayloadFormat((ost::StaticPayloadType) _audiocodec->getPayload()));
+            }
+        }
+        _sessionSend->setMark(true);
+    } else {
+
+        bool payloadIsSet = false;
+        if (_audiocodec) {
+            if (_audiocodec->hasDynamicPayload()) {
+                payloadIsSet = _session->setPayloadFormat(ost::DynamicPayloadFormat((ost::PayloadType) _audiocodec->getPayload(), _audiocodec->getClockRate()));
+            } else {
+                payloadIsSet = _session->setPayloadFormat(ost::StaticPayloadFormat((ost::StaticPayloadType) _audiocodec->getPayload()));
+            }
+        }
+    }
+
+}
+
+void
+AudioRtpRTX::setRtpSessionRemoteIp(void)
+{
+    if (_ca == 0) { return; }
+
+    ost::InetHostAddress remote_ip(_ca->getLocalSDP()->get_remote_ip().c_str());
+    _debug("Init audio RTP session %s\n", _ca->getLocalSDP()->get_remote_ip().data());
+    if (!remote_ip) {
+        _debug("! ARTP Thread Error: Target IP address [%s] is not correct!\n", _ca->getLocalSDP()->get_remote_ip().data());
+        return;
+    }
+    
+    if (!_sym) {
+
+	if ( !_sessionRecv->addDestination(remote_ip, (unsigned short) _ca->getLocalSDP()->get_remote_audio_port()) ) {
+            _debug("AudioRTP Thread Error: could not connect to port %d\n",  _ca->getLocalSDP()->get_remote_audio_port());
+            return;
+        }
+        if (!_sessionSend->addDestination (remote_ip, (unsigned short) _ca->getLocalSDP()->get_remote_audio_port())) {
+            _debug("! ARTP Thread Error: could not connect to port %d\n", _ca->getLocalSDP()->get_remote_audio_port());
+            return;
+        }
+
+        _sessionSend->setMark(true);
+    } else {
+
+        if (!_session->addDestination (remote_ip, (unsigned short)_ca->getLocalSDP()->get_remote_audio_port() )) {
+            return;
+        }
+
+    }
+
+}
+
+
+
 float 
 AudioRtpRTX::computeCodecFrameSize(int codecSamplePerFrame, int codecClockRate)
 {

sflphone-common/src/audio/audiortp.h

@@ -74,6 +74,16 @@ class AudioRtpRTX : public ost::Thread, public ost::TimerPort {
     /** A SIP call */
     SIPCall* _ca;
 
+   /**
+     * Update RTP session media info as received from SDP negociation 
+     */
+    void setRtpSessionMedia(void);
+
+    /**
+     * Update RTP session remote ip destination as received from sip transaction 
+     */
+    void setRtpSessionRemoteIp(void); 
+
     
     friend class RtpTest;
 
@@ -222,6 +232,11 @@ class AudioRtp {
      */
     bool closeRtpSession( void );
 
+    /**
+     * Return a pointer to the RTP thead
+     */
+    AudioRtpRTX* getRTX();
+
     /**
      * Start recording
      */

sflphone-common/src/sdp.cpp

@@ -296,6 +296,7 @@ void Sdp::set_negociated_offer( const pjmedia_sdp_session *sdp ){
         // Retrieve the payload
         nb_codecs = current->desc.fmt_count;  // Must be one
         for( j=0 ; j<nb_codecs ; j++ ){
+	  _debug("================== set_negociated_offer ===================== %i\n", atoi(current->desc.fmt[j].ptr));
             iter = codecs_list.find((AudioCodecType)atoi(current->desc.fmt[j].ptr));  
             if (iter==codecs_list.end())
                 return;
@@ -417,6 +418,7 @@ void Sdp::fetch_remote_ip_from_sdp (pjmedia_sdp_session *r_sdp) {
     std::string remote_ip;
 
     remote_ip = r_sdp->conn->addr.ptr;
+    _debug("            Remote IP from fetching SDP: %s\n", remote_ip.c_str());
     this->set_remote_ip(remote_ip);
 }
 
@@ -425,12 +427,14 @@ void Sdp::fetch_remote_audio_port_from_sdp (pjmedia_sdp_media *r_media){
     int remote_port;
     
     remote_port = r_media->desc.port;
-    _debug("            Remote Audio Port: %d\n", remote_port);
+    _debug("            Remote Audio Port from fetching SDP: %d\n", remote_port);
     this->set_remote_audio_port(remote_port);
 }
 
 void Sdp::fetch_media_transport_info_from_remote_sdp (pjmedia_sdp_session *remote_sdp) {
 
+    _debug("Fetching media from sdp\n");
+
     pjmedia_sdp_media *r_media;
 
     this->get_remote_sdp_media_from_offer (remote_sdp, &r_media);