@babblevoice/projectrtp 2.4.17 → 2.5.22

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,19 +198,13 @@ void projectchannelmux::handletick( const boost::system::error_code& error ) {
 
   if( 0 == this->channels.size() ) {
     /* We're done */
+    this->active = false;
     return;
   }
 
   for( auto& chan: this->channels ) {
     chan->startticktimer();
-  }
-
-  for( auto& chan: this->channels ) {
     chan->checkfornewrecorders();
-  }
-
-  for( auto& chan: this->channels ) {
-    chan->dtlsnegotiate();
     chan->incrtsout();
   }
 
@@ -219,14 +218,15 @@ void projectchannelmux::handletick( const boost::system::error_code& error ) {
     chan->senddtmf();
     chan->writerecordings();
     chan->checkidlerecv();
-  }
-
-  for( auto& chan: this->channels ) {
     chan->endticktimer();
   }
 
   /* The last thing we do */
   this->setnexttick();
+
+  for( auto& chan: this->channels ) {
+    chan->endticktimer();
+  }
 }
 
 void projectchannelmux::setnexttick( void ) {
@@ -239,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() );
@@ -293,12 +297,15 @@ void projectchannelmux::checkfornewmixes( void ) {
 
 void projectchannelmux::addchannel( projectrtpchannelptr chan ) {
   AQUIRESPINLOCK( this->newchannelslock );
+  chan->mixing = true;
   this->newchannels.push_back( chan );
   RELEASESPINLOCK( this->newchannelslock );
 }
 
 void projectchannelmux::addchannels( projectrtpchannelptr chana, projectrtpchannelptr chanb ) {
   AQUIRESPINLOCK( this->newchannelslock );
+  chana->mixing = true;
+  chanb->mixing = true;
   this->newchannels.push_back( chana );
   this->newchannels.push_back( chanb );
   RELEASESPINLOCK( this->newchannelslock );
@@ -313,6 +320,7 @@ void projectchannelmux::postrtpdata( projectrtpchannelptr srcchan, projectrtpcha
   rtppacket *dst = dstchan->gettempoutbuf();
 
   if( nullptr == dst ) {
+    dstchan->outpkdropcount++;
     fprintf( stderr, "We have a null out buffer\n" );
     return;
   }

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

@@ -1,5 +1,7 @@
 
 #include <iostream>
+#include <cstdlib>
+#include <iomanip>
 #include <math.h>
 
 #include "projectrtpcodecx.h"
@@ -85,7 +87,6 @@ codecx::codecx() :
   ilbcencoder( nullptr ),
   ilbcdecoder( nullptr ),
   lpfilter(),
-  resamplelastsample( 0 ),
   l168kref(),
   l1616kref(),
   pcmaref(),
@@ -144,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;
 }
 
@@ -158,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++;
@@ -185,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++;
@@ -215,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++;
@@ -255,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++;
@@ -279,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++;
@@ -313,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 );
-    this->l168kref.dirty( false );
     return 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 );
-  }
-
+  this->l168kref.dirty( false );
   return true;
 }
 
@@ -373,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;
   }
@@ -388,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.
@@ -396,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 );
@@ -409,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;
 }
@@ -421,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++;
   }
@@ -455,7 +441,7 @@ bool codecx::requirewideband( void ) {
   if( this->g722tol16() ) return true;
   if( !this->g711tol16() )
   {
-    if( this->ilbctol16() ) return false;
+    if( !this->ilbctol16() ) return false;
   }
 
   return this->l16lowtowideband();
@@ -465,22 +451,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++;
   }
@@ -518,9 +502,10 @@ rawsound& codecx::requirel16( void )
   return this->l168kref;
 }
 
-/*
-# getref
-returns a reference to the relavent rawsound and ensures it is transcoded if required.
+/**
+ * Obtain a reference to a rawsound for the codec type pt. i.e. we alrteady have 
+ * the input sound and based on the format we want to convert it to that 
+ * format.
 */
 rawsound& codecx::getref( int pt ) {
   /* If we have already have or converted this packet... */
@@ -558,7 +543,7 @@ rawsound& codecx::getref( int pt ) {
       return this->g722ref;
     }
     case PCMAPAYLOADTYPE: {
-      if( this->pcmuref.size() > 0 ) {
+      if( !this->pcmuref.isdirty() && this->pcmuref.size() > 0 ) {
         this->ulaw2alaw();
       } else {
         this->requirenarrowband();
@@ -567,7 +552,7 @@ rawsound& codecx::getref( int pt ) {
       return this->pcmaref;
     }
     case PCMUPAYLOADTYPE: {
-      if( this->pcmaref.size() > 0 ) {
+      if( !this->pcmaref.isdirty() && this->pcmaref.size() > 0 ) {
         this->alaw2ulaw();
       } else {
         this->requirenarrowband();
@@ -586,7 +571,7 @@ rawsound& codecx::getref( int pt ) {
   }
 
   /* We should ever get here unless an invalid param has been passed in */
-  std::cerr << "codecx::getref call with bad pt" << std::endl;
+  std::cerr << "codecx::getref call with bad pt: " << pt << std::endl;
   return this->pcmuref;
 }
 
@@ -625,52 +610,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

@@ -3,6 +3,8 @@
 #ifndef PROJECTRTPCODECX_H
 #define PROJECTRTPCODECX_H
 
+#include <iostream>
+#include <cstdlib>
 
 #include <ilbc.h>
 #include <spandsp.h>
@@ -83,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;
@@ -127,6 +127,8 @@ auto* operator << ( auto *pk, codecx& c ) {
 
   switch( outpayloadtype ) {
     case ILBCPAYLOADTYPE: {
+      pk->setpayloadlength( ILBC20PAYLOADBYTES );
+
       if( !c.ilbcref.isdirty() ) {
         pk->copy( c.ilbcref.c_str(), c.ilbcref.size() * c.ilbcref.getbytespersample() );
         return pk;
@@ -135,6 +137,7 @@ auto* operator << ( auto *pk, codecx& c ) {
       break;
     }
     case G722PAYLOADTYPE: {
+      pk->setpayloadlength( G722PAYLOADBYTES );
       if( !c.g722ref.isdirty() ) {
         pk->copy( c.g722ref.c_str(), c.g722ref.size() * c.g722ref.getbytespersample() );
         return pk;
@@ -143,6 +146,7 @@ auto* operator << ( auto *pk, codecx& c ) {
       break;
     }
     case PCMAPAYLOADTYPE: {
+      pk->setpayloadlength( G711PAYLOADBYTES );
       if( !c.pcmaref.isdirty() ) {
         pk->copy( c.pcmaref.c_str(), c.pcmaref.size() * c.pcmaref.getbytespersample() );
         return pk;
@@ -151,6 +155,7 @@ auto* operator << ( auto *pk, codecx& c ) {
       break;
     }
     case PCMUPAYLOADTYPE: {
+      pk->setpayloadlength( G711PAYLOADBYTES );
       if( !c.pcmuref.isdirty() ) {
         pk->copy( c.pcmuref.c_str(), c.pcmuref.size() * c.pcmuref.getbytespersample() );
         return pk;
@@ -159,6 +164,7 @@ auto* operator << ( auto *pk, codecx& c ) {
       break;
     }
     case L168KPAYLOADTYPE: {
+      pk->setpayloadlength( L16NARROWBANDBYTES );
       if( !c.l168kref.isdirty() ) {
         pk->copy( c.l168kref.c_str(), c.l168kref.size() * c.l168kref.getbytespersample() );
         return pk;
@@ -168,6 +174,7 @@ auto* operator << ( auto *pk, codecx& c ) {
     }
 
     case L1616KPAYLOADTYPE: {
+      pk->setpayloadlength( L16WIDEBANDBYTES );
       if( !c.l1616kref.isdirty() ) {
         pk->copy( c.l1616kref.c_str(), c.l1616kref.size() * c.l1616kref.getbytespersample() );
         return pk;
@@ -175,10 +182,16 @@ auto* operator << ( auto *pk, codecx& c ) {
       c.l1616kref = rawsound( *pk, true );
       break;
     }
+    default: {
+      /* this should not happen */
+      std::cerr << "Unknown CODEC when encoding: " << outpayloadtype << std::endl;
+      return pk;
+    }
   }
 
-  rawsound r = c.getref( outpayloadtype );
-  pk->setpayloadlength( r.size() );
+  /* encode */
+  c.getref( outpayloadtype );
+
   return pk;
 }