@babblevoice/projectrtp 2.5.20 → 2.5.25

package/README.md

@@ -60,7 +60,7 @@ If you wish to build outsode of a Docker image, there are npm target scripts for
 
 ```bash
 docker buildx prune
-docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.4.20_beta1 . --push
+docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.5.23_beta4 . --push
 ```
 
 ## Example scripts

package/lib/server.js

@@ -277,7 +277,15 @@ class channel {
 
     options.channel = "open"
 
-    const resolvepromise = new Promise( ( resolve ) => {
+    const resolvepromise = new Promise( ( resolve, reject ) => {
+
+      if ( 0 < nodes.size ) {
+        const node = randomenode( options.nodeinstance )
+        const request = JSON.parse( JSON.stringify( options ) )
+        request.channel = "open"
+        channel._createforlisten( request, node, cb, resolve, reject )
+        return
+      }
 
       const newchannel = new channel()
       if( cb ) newchannel.em.on( "all", cb )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.5.20",
+  "version": "2.5.25",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {

package/src/globals.h

@@ -9,6 +9,9 @@
 #define G711PAYLOADBYTES 160
 #define G722PAYLOADBYTES 160
 #define L16PAYLOADSAMPLES 160
+#define G711PAYLOADSAMPLES 160
+#define G722PAYLOADSAMPLES 160
+#define L1616PAYLOADSAMPLES 320
 #define L16NARROWBANDBYTES 320
 #define L16WIDEBANDBYTES 640
 #define ILBC20PAYLOADBYTES 38

package/src/projectrtpchannel.cpp

@@ -655,7 +655,7 @@ bool projectrtpchannel::checkfordtmf( rtppacket *src ) {
   uint16_t sn = src->getsequencenumber();
 
   if( 0 != this->rfc2833pt &&
-      src->getpayloadtype() == this->rfc2833pt ) {
+      src->getpayloadtype() == RFC2833PAYLOADTYPE ) {
 
     if( src->getpayloadlength() >= 4 ) {
       /* We have to look for DTMF events handling issues like missing events - such as the marker or end bit */
@@ -811,7 +811,8 @@ void projectrtpchannel::correctaddress( void ) {
  */
 void projectrtpchannel::correctssrc( uint32_t ssrc ) {
   if( !this->receivedrtp ) {
-    this->receivedrtp = true;
+    /* allow settling */
+    if( this->inbuff->getpushed() > 5 )this->receivedrtp = true;
     this->ssrcin = ssrc;
   }
 }
@@ -876,10 +877,21 @@ void projectrtpchannel::readsomertp( void ) {
           goto readsomemore;
         }
 
+        /* TODO ZRTP? */
+        if( buf->getpacketextension() ) {
+          this->receivedpkskip++;
+          goto readsomemore;
+        }
+
         this->tickswithnortpcount = 0;
 
         this->correctaddress();
+
+        /*
+        after speaking with Magrathea - more streams are changing ssrc without notice mid-stream
+        for now do not check.
         this->correctssrc( buf->getssrc() );
+        */
         
         if( this->confirmedrtpsenderendpoint != this->rtpsenderendpoint ) {
           /* After the first packet - we only accept data from the verified source */
@@ -887,10 +899,12 @@ void projectrtpchannel::readsomertp( void ) {
           goto readsomemore;
         }
 
+        /*
         if( buf->getssrc() != this->ssrcin ) {
           this->receivedpkskip++;
           goto readsomemore;
         }
+        */
 
         /* dynamic payload types */
         auto pt = buf->getpayloadtype();

package/src/projectrtpchannelmux.cpp

@@ -15,7 +15,8 @@ projectchannelmux::projectchannelmux( boost::asio::io_context &iocontext ):
   newchannels(),
   newchannelslock( false ),
   added(),
-  subtracted() {
+  subtracted(),
+  active( false ) {
 }
 
 projectchannelmux::~projectchannelmux() {
@@ -29,22 +30,24 @@ projectchannelmux::pointer projectchannelmux::create( boost::asio::io_context &i
 void projectchannelmux::mixall( void ) {
   /* First decide on a common rate (if we only have 8K channels it is pointless
   upsampling them all and wasting resources) */
-  int l16krequired = L168KPAYLOADTYPE;
+  int l16format = L168KPAYLOADTYPE;
   size_t insize = L16PAYLOADSAMPLES;
 
   for( auto& chan: this->channels ) {
     switch( chan->codec ) {
       case G722PAYLOADTYPE:
       case L1616KPAYLOADTYPE: {
-        l16krequired = L1616KPAYLOADTYPE;
+        l16format = L1616KPAYLOADTYPE;
+        insize = L1616PAYLOADSAMPLES;
         goto endofforloop;
       }
     }
   }
   endofforloop:
 
-  this->added.malloc( insize, sizeof( int16_t ), l16krequired );
-  this->subtracted.malloc( insize, sizeof( int16_t ), l16krequired );
+  /* allocate the max needed */
+  this->added.malloc( insize, sizeof( int16_t ), l16format );
+  this->subtracted.malloc( insize, sizeof( int16_t ), l16format );
   this->added.zero();
 
   /* We first have to add them all up */
@@ -186,6 +189,8 @@ Our timer handler.
 void projectchannelmux::handletick( const boost::system::error_code& error ) {
   if ( error == boost::asio::error::operation_aborted ) return;
 
+  if( !this->active ) return;
+
   this->checkfornewmixes();
 
   /* Check for channels which have request removal */
@@ -193,6 +198,7 @@ void projectchannelmux::handletick( const boost::system::error_code& error ) {
 
   if( 0 == this->channels.size() ) {
     /* We're done */
+    this->active = false;
     return;
   }
 
@@ -233,6 +239,10 @@ void projectchannelmux::setnexttick( void ) {
 }
 
 void projectchannelmux::go( void ) {
+
+  if( this->active ) return;
+  this->active = true;
+
   this->nexttick = std::chrono::high_resolution_clock::now() + std::chrono::milliseconds( 20 );
 
   this->tick.expires_after( this->nexttick - std::chrono::high_resolution_clock::now() );
@@ -315,8 +325,8 @@ void projectchannelmux::postrtpdata( projectrtpchannelptr srcchan, projectrtpcha
     return;
   }
 
-  if( src->getpayloadtype() == srcchan->rfc2833pt ) {
-    dst->setpayloadtype( srcchan->rfc2833pt );
+  if( src->getpayloadtype() == RFC2833PAYLOADTYPE ) {
+    dst->setpayloadtype( dstchan->rfc2833pt );
     dst->copy( src );
   } else {
     srcchan->incodec << codecx::next;

package/src/projectrtpchannelmux.h

@@ -22,8 +22,8 @@ typedef std::shared_ptr< projectrtpchannel > projectrtpchannelptr;
 typedef std::list< projectrtpchannelptr > projectchanptrlist;
 
 class projectchannelmux:
-  public std::enable_shared_from_this< projectchannelmux >
-{
+  public std::enable_shared_from_this< projectchannelmux > {
+
 public:
   projectchannelmux( boost::asio::io_context &iocontext );
   ~projectchannelmux();
@@ -58,6 +58,8 @@ private:
 
   rawsound added;
   rawsound subtracted;
+
+  bool active;
 };
 
 #endif /* PROJECTRTPCHANNELMUX_H */

package/src/projectrtpcodecx.cpp

@@ -87,7 +87,6 @@ codecx::codecx() :
   ilbcencoder( nullptr ),
   ilbcdecoder( nullptr ),
   lpfilter(),
-  resamplelastsample( 0 ),
   l168kref(),
   l1616kref(),
   pcmaref(),
@@ -146,7 +145,6 @@ Do enough to manage missing packets.
 void codecx::restart( void ) {
   this->lpfilter.reset();
   this->dcpowerfilter.reset();
-  this->resamplelastsample = 0;
   this->_hasdata = false;
 }
 
@@ -160,19 +158,17 @@ bool codecx::alaw2ulaw( void ) {
   if( this->pcmaref.isdirty() ) return false;
 
   uint8_t *inbufptr, *outbufptr;
-  size_t insize;
 
-  insize = this->pcmaref.size();
   inbufptr = this->pcmaref.c_str();
   outbufptr = this->pcmuref.c_str();
-  this->pcmuref.size( insize );
+  this->pcmuref.size( G711PAYLOADBYTES );
 
   if( nullptr == outbufptr || nullptr == inbufptr ) {
     std::cerr << "PCMA NULLPTR shouldn't happen (" << (void*)outbufptr << ", " << (void*)inbufptr << ")" << std::endl;
     return false;
   }
 
-  for( size_t i = 0; i < insize; i++ ) {
+  for( size_t i = 0; i < G711PAYLOADBYTES; i++ ) {
     *outbufptr = alaw_to_ulaw_table[ *inbufptr ];
     inbufptr++;
     outbufptr++;
@@ -187,19 +183,17 @@ bool codecx::ulaw2alaw( void ) {
   if( this->pcmuref.isdirty() ) return false;
 
   uint8_t *inbufptr, *outbufptr;
-  size_t insize;
 
-  insize = this->pcmuref.size();
   inbufptr = this->pcmuref.c_str();
   outbufptr = this->pcmaref.c_str();
-  this->pcmaref.size( insize );
+  this->pcmaref.size( G711PAYLOADBYTES );
 
   if( nullptr == outbufptr || nullptr == inbufptr ) {
     std::cerr << "PCMU NULLPTR shouldn't happen(" << (void*)outbufptr << ", " << (void*)inbufptr << ")" << std::endl;
     return false;
   }
 
-  for( size_t i = 0; i < insize; i++ ) {
+  for( size_t i = 0; i < G711PAYLOADBYTES; i++ ) {
     *outbufptr = ulaw_to_alaw_table[ *inbufptr ];
     inbufptr++;
     outbufptr++;
@@ -217,25 +211,22 @@ bool codecx::g711tol16( void )
 {
   uint8_t *in;
   int16_t *convert;
-  size_t insize;
 
   if( this->pcmaref.size() > 0 && !this->pcmaref.isdirty() ) {
     in = this->pcmaref.c_str();
     convert = _pcmatol16;
-    insize = this->pcmaref.size();
   } else if ( this->pcmuref.size() > 0 && !this->pcmuref.isdirty() ) {
     in = this->pcmuref.c_str();
     convert = _pcmutol16;
-    insize = this->pcmuref.size();
   } else {
     return false;
   }
 
-  this->l168kref.malloc( insize, sizeof( int16_t ), L168KPAYLOADTYPE );
+  this->l168kref.malloc( G711PAYLOADSAMPLES, sizeof( int16_t ), L168KPAYLOADTYPE );
 
   int16_t *out = ( int16_t * ) this->l168kref.c_str();
 
-  for( size_t i = 0; i < insize; i++ ) {
+  for( size_t i = 0; i < G711PAYLOADSAMPLES; i++ ) {
     *out = convert[ *in ];
     in++;
     out++;
@@ -257,11 +248,10 @@ bool codecx::l16topcma( void )
   uint8_t *out = this->pcmaref.c_str();
 
   int16_t *in;
-  size_t l168klength = this->l168kref.size();
   in = ( int16_t * ) this->l168kref.c_str();
 
   uint16_t index;
-  for( size_t i = 0; i < l168klength; i++ ) {
+  for( size_t i = 0; i < G711PAYLOADBYTES; i++ ) {
     index = *in + 32768;
     *out = _l16topcma[ index ];
     in++;
@@ -281,11 +271,10 @@ bool codecx::l16topcmu( void ) {
   uint8_t *out = this->pcmuref.c_str();;
 
   int16_t *in;
-  size_t l168klength = this->l168kref.size();
   in = ( int16_t * ) this->l168kref.c_str();
 
   uint16_t index;
-  for( size_t i = 0; i < l168klength; i++ ) {
+  for( size_t i = 0; i < G711PAYLOADBYTES; i++ ) {
     index = *in + 32768;
     *out = _l16topcmu[ index ];
     in++;
@@ -315,43 +304,16 @@ bool codecx::ilbctol16( void ) {
 
   int16_t l168klength = WebRtcIlbcfix_Decode( this->ilbcdecoder,
                         ( ilbcencodedval ) this->ilbcref.c_str(),
-                        this->ilbcref.size(),
+                        ILBC20PAYLOADBYTES,
                         ( ilbcdecodedval )this->l168kref.c_str(),
                         &speechType
                       );
 
   if( -1 == l168klength ) {
-    this->l168kref.size( 0 );
     return false;
   }
 
   this->l168kref.dirty( false );
-  this->l168kref.size( l168klength );
-  return true;
-}
-
-/*!md
-## l16tog722
-As it says.
-*/
-bool codecx::l16tog722( void ) {
-  if( 0 == this->l1616kref.size() ) return false;
-  if( this->l1616kref.isdirty() ) return false;
-
-  if( nullptr == this->g722encoder ) {
-    this->g722encoder = g722_encode_init( NULL, 64000, G722_PACKED );
-  }
-
-  int len = g722_encode( this->g722encoder, this->g722ref.c_str(), ( int16_t * ) this->l1616kref.c_str(), this->g722ref.size() * 2 );
-
-  if( len > 0 ) {
-    this->g722ref.size( len );
-    this->g722ref.dirty( false );
-  } else {
-    std::cerr << "g722_encode didn't encode any data" << std::endl;
-    this->g722ref.size( 0 );
-  }
-
   return true;
 }
 
@@ -375,11 +337,10 @@ bool codecx::l16toilbc( void ) {
 
   int16_t len = WebRtcIlbcfix_Encode( this->ilbcencoder,
                             ( ilbcdecodedval ) this->l168kref.c_str(),
-                            this->l168kref.size(),
+                            L16PAYLOADSAMPLES,
                             ( ilbcencodedval ) this->ilbcref.c_str()
                           );
   if ( len > 0 ) {
-    this->ilbcref.size( len );
     this->ilbcref.dirty( false );
     return true;
   }
@@ -390,6 +351,33 @@ bool codecx::l16toilbc( void ) {
 }
 
 
+/*!md
+## l16tog722
+As it says.
+*/
+bool codecx::l16tog722( void ) {
+
+  if( 0 == this->l1616kref.size() ) return false;
+  if( this->l1616kref.isdirty() ) return false;
+
+  if( nullptr == this->g722encoder ) {
+    this->g722encoder = g722_encode_init( NULL, 64000, G722_PACKED );
+  }
+
+  // TODO - when we convert to g722 - 722 buffer is always output -so malloc need sto be able to detect that.
+  //this->g722ref.malloc( G722PAYLOADSAMPLES, sizeof( int8_t ), G722PAYLOADTYPE );
+
+  int len = g722_encode( this->g722encoder, this->g722ref.c_str(), ( int16_t * ) this->l1616kref.c_str(), L1616PAYLOADSAMPLES );
+
+  if( 160 != len ) {
+    std::cerr << "g722_encode didn't encode correct length of data" << std::endl;
+    return false;
+  }
+
+  this->g722ref.dirty( false );
+  return true;
+}
+
 /*!md
 ## g722tol16
 As it says.
@@ -398,8 +386,7 @@ bool codecx::g722tol16( void ) {
   if( 0 == this->g722ref.size() ) return false;
   if( this->g722ref.isdirty() ) return false;
 
-  /* x 2 for 16 bit instead of 8 and then x 2 sample rate */
-  this->l1616kref.malloc( this->g722ref.size(), sizeof( int16_t ), L1616KPAYLOADTYPE );
+  this->l1616kref.malloc( L1616PAYLOADSAMPLES, sizeof( int16_t ), L1616KPAYLOADTYPE );
 
   if( nullptr == this->g722decoder ) {
     this->g722decoder = g722_decode_init( NULL, 64000, G722_PACKED );
@@ -411,9 +398,10 @@ bool codecx::g722tol16( void ) {
   size_t l1616klength = g722_decode( this->g722decoder,
                                 ( int16_t * ) this->l1616kref.c_str(),
                                 this->g722ref.c_str(),
-                                this->g722ref.size() );
+                                G722PAYLOADBYTES );
 
-  this->l1616kref.size( l1616klength );
+  if( 320 != l1616klength ) return false;
+  
   this->l1616kref.dirty( false );
   return true;
 }
@@ -423,23 +411,19 @@ bool codecx::g722tol16( void ) {
 Upsample from narrow to wideband. Take each point and interpolate between them. We require the final sample from the last packet to continue the interpolating.
 */
 bool codecx::l16lowtowideband( void ) {
-  size_t l168klength = this->l168kref.size();
 
-  if( 0 == l168klength ) return false;
+  if( 0 == this->l168kref.size() ) return false;
   if( this->l168kref.isdirty() ) return false;
 
-  this->l1616kref.malloc( l168klength, sizeof( int16_t ), L1616KPAYLOADTYPE );
+  this->l1616kref.malloc( L1616PAYLOADSAMPLES, sizeof( int16_t ), L1616KPAYLOADTYPE );
 
   int16_t *in = ( int16_t * ) this->l168kref.c_str();
   int16_t *out = ( int16_t * ) this->l1616kref.c_str();
 
-  for( size_t i = 0; i < l168klength; i++ ) {
-    *out = ( ( *in - this->resamplelastsample ) / 2 ) + this->resamplelastsample;
-    this->resamplelastsample = *in;
+  for( size_t i = 0; i < L16PAYLOADSAMPLES; i++ ) {
+    *out = this->lpfilter.execute( *in );
     out++;
-
-    *out = *in;
-
+    *out = this->lpfilter.execute( 0 );
     out++;
     in++;
   }
@@ -454,10 +438,16 @@ Search for the relevent data and convert as necessary.
 */
 bool codecx::requirewideband( void ) {
   if( 0 != this->l1616kref.size() && !this->l1616kref.isdirty() ) return true;
+
+  if( 0 != this->l168kref.size() && !this->l168kref.isdirty() ) {
+    return this->l16lowtowideband();
+  }
+
   if( this->g722tol16() ) return true;
-  if( !this->g711tol16() )
-  {
-    if( this->ilbctol16() ) return false;
+  if( !this->g711tol16() ) {
+    if( !this->ilbctol16() ) {
+      return false;
+    }
   }
 
   return this->l16lowtowideband();
@@ -467,22 +457,20 @@ bool codecx::requirewideband( void ) {
 ##  l16widetolowband
 Downsample our L16 wideband samples to 8K. Pass through filter then grab every other sample.
 */
-bool codecx::l16widetonarrowband( void )
-{
-  size_t l1616klength = this->l1616kref.size();
+bool codecx::l16widetonarrowband( void ) {
 
-  if( 0 == l1616klength ) return false;
+  if( 0 == this->l1616kref.size() ) return false;
   if( this->l1616kref.isdirty() ) return false;
 
-  this->l168kref.malloc( l1616klength / 2, sizeof( int16_t ), L168KPAYLOADTYPE );
+  this->l168kref.malloc( L16PAYLOADSAMPLES, sizeof( int16_t ), L168KPAYLOADTYPE );
 
   int16_t *out = ( int16_t * ) this->l168kref.c_str();
   int16_t *in = ( int16_t * ) this->l1616kref.c_str();
 
-  for( size_t i = 0; i < l1616klength / 2; i++ ) {
-    lpfilter.execute( *in );
+  for( size_t i = 0; i < L16PAYLOADSAMPLES; i++ ) {
+    this->lpfilter.execute( *in );
     in++;
-    *out = lpfilter.execute( *in );
+    *out = this->lpfilter.execute( *in );
     in++;
     out++;
   }
@@ -495,9 +483,13 @@ bool codecx::l16widetonarrowband( void )
 ## requirenarrowband
 Search for the relevent data and convert as necessary.
 */
-bool codecx::requirenarrowband( void )
-{
+bool codecx::requirenarrowband( void ) {
   if( 0 != this->l168kref.size() && !this->l168kref.isdirty() ) return true;
+
+  if( 0 != this->l1616kref.size() && !this->l1616kref.isdirty() ) {
+    return this->l16widetonarrowband();
+  }
+
   if( this->g711tol16() ) return true;
   if( this->ilbctol16() ) return true;
   this->g722tol16();
@@ -628,52 +620,43 @@ We pass a packet in, then we can take multiple out - i.e. we may want different
 
 Have a think about if this is where we want to mix audio data.
 */
-codecx& operator << ( codecx& c, rtppacket& pk )
-{
+codecx& operator << ( codecx& c, rtppacket& pk ) {
   c.inpkcount++;
   rawsound r = rawsound( pk );
   c << r;
   return c;
 }
 
-codecx& operator << ( codecx& c, rawsound& raw )
-{
+codecx& operator << ( codecx& c, rawsound& raw ) {
   int inpayloadtype = raw.getformat();
 
-  switch( inpayloadtype )
-  {
-    case PCMAPAYLOADTYPE:
-    {
+  switch( inpayloadtype ) {
+    case PCMAPAYLOADTYPE: {
       c.pcmaref = raw;
       c._hasdata = true;
       break;
     }
-    case PCMUPAYLOADTYPE:
-    {
+    case PCMUPAYLOADTYPE: {
       c.pcmuref = raw;
       c._hasdata = true;
       break;
     }
-    case ILBCPAYLOADTYPE:
-    {
+    case ILBCPAYLOADTYPE: {
       c.ilbcref = raw;
       c._hasdata = true;
       break;
     }
-    case G722PAYLOADTYPE:
-    {
+    case G722PAYLOADTYPE: {
       c.g722ref = raw;
       c._hasdata = true;
       break;
     }
-    case L168KPAYLOADTYPE:
-    {
+    case L168KPAYLOADTYPE: {
       c.l168kref = raw;
       c._hasdata = true;
       break;
     }
-    case L1616KPAYLOADTYPE:
-    {
+    case L1616KPAYLOADTYPE: {
       c.l1616kref = raw;
       c._hasdata = true;
       break;

package/src/projectrtpcodecx.h

@@ -85,10 +85,8 @@ private:
   ilbcencinst *ilbcencoder;
   ilbcdecinst *ilbcdecoder;
 
-  /* If we require downsampling */
+  /* If we require up/downsampling */
   lowpass3_4k16k lpfilter;
-  /* When we up sample we need to interpolate so need last sample */
-  int16_t resamplelastsample;
 
   rawsound l168kref;
   rawsound l1616kref;