@babblevoice/babble-drachtio-callmanager 1.6.8 → 1.6.9

package/lib/call.js

@@ -953,7 +953,7 @@ class call {
 
     this.sdp.remote = sdpgen.create( this._dialog.remote.sdp )
     this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-    if( "" == this.selectedcodec ) {
+    if( !this.selectedcodec ) {
       return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
     }
 
@@ -1026,23 +1026,27 @@ class call {
       } else {
         alegremotesdp = sdpgen.create( this.parent._req.msg.body )
       }
+      let alegpossiblecodecs = alegremotesdp.intersection( this.options.preferedcodecs )
+      if( !alegpossiblecodecs ) alegpossiblecodecs = alegremotesdp.intersection( callmanager.options.preferedcodecs )
+      if( !alegpossiblecodecs ) {
+        return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
+      }
 
-      this.selectedcodec = this.sdp.remote.intersection(
-        alegremotesdp.intersection( this.options.preferedcodecs ), true )
-
+      this.selectedcodec = this.sdp.remote.intersection( alegpossiblecodecs, true )
+      /* if this doesn't work - then we will have to transcode if we can find a codec which works */
       if( this.selectedcodec ) {
         this.parent.selectedcodec = this.selectedcodec
       } else {
-        /* Ok - transcode */
         this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-        if( "" == this.selectedcodec || "" == this.parent.selectedcodec ) {
+        if( !this.selectedcodec ) this.selectedcodec = this.sdp.remote.intersection( callmanager.options.preferedcodecs )
+        if( !this.selectedcodec ) {
           return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
         }
       }
     } else {
       /* no parent - just pick our prefered codec */
       this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-      if( "" == this.selectedcodec ) {
+      if( !this.selectedcodec ) {
         return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
       }
     }
@@ -1088,7 +1092,7 @@ class call {
 
     if( this.parent ) {
       if( !this.parent.established ) {
-        await this.parent.answer( { "preferedcodecs": this.selectedcodec } )
+        await this.parent.answer()
           .catch( ( err ) => {
             console.trace( err )
           } )
@@ -1435,9 +1439,11 @@ class call {
     if( this._req.msg && this._req.msg.body ) {
       /* options.preferedcodecs may have been narrowed down so we still check callmanager as well */
       this.selectedcodec = this.sdp.remote.intersection( options.preferedcodecs, true )
-      if( false === this.selectedcodec ) {
-        this.selectedcodec = this.sdp.remote.intersection( callmanager.options.preferedcodecs, true )
+      if( !this.selectedcodec ) this.selectedcodec = this.sdp.remote.intersection( callmanager.options.preferedcodecs, true )
+      if( !this.selectedcodec ) {
+        return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
       }
+      
       let remoteaudio = this.sdp.remote.getaudio()
       if( !remoteaudio ) return
 

package/lib/sdp.js

@@ -431,7 +431,10 @@ class sdp {
       if ( undefined != codecconv[ codec ] ) a[ i ] = codecconv[ codec ]
     } )
 
-    return retval.join( " " )
+    let full = retval.join( " " )
+    if( !full ) return false
+    
+    return full
   }
 
   toString() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {

package/test/interface/sdp.js

@@ -330,4 +330,41 @@ a=rtpmap:8 PCMA/8000`
     expect( def.remote.port ).to.equal( 48380 )
     expect( def.remote.codec ).to.equal( 8 )
   } )
+
+  it( `another real life example`, async function() {
+    const testsdp = `v=0
+o=MTLSBC 1664810796 1664810796 IN IP4 213.166.4.133
+s=SIP Call
+c=IN IP4 213.166.4.133
+t=0 0
+m=audio 52290 RTP/AVP 8 101 13 0 3 18
+a=rtpmap:8 PCMA/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:3 GSM/8000
+a=rtpmap:18 G729/8000
+a=fmtp:18 annexb=no
+a=rtpmap:101 telephone-event/8000
+a=fmtp:101 0-16
+a=rtpmap:13 CN/8000
+a=ptime:20`
+
+    let oursdp = sdp.create( testsdp )
+
+    let selectedcodec = oursdp.intersection( "g722", true )
+    console.log("selectedcodec",selectedcodec)
+    return
+    selectedcodec = oursdp.intersection( "g722", true )
+    let remoteaudio = oursdp.getaudio()
+
+    oursdp.select( selectedcodec )
+
+    let ourlocalsdp = sdp.create()
+                .addcodecs( selectedcodec )
+                .addcodecs( "2833" )
+                .setconnectionaddress( "1.1.1.1" )
+                .setaudioport( 1000 )
+
+    console.log(ourlocalsdp.toString())
+
+  } )
 } )