@babblevoice/projectrtp 2.4.17 → 2.5.22

package/src/projectrtppacket.cpp

@@ -1,8 +1,7 @@
 
-#ifdef TESTSUITE
 #include <iostream>
+#include <cstdlib>
 #include  <iomanip>
-#endif
 
 #include "projectrtppacket.h"
 #include "globals.h"
@@ -43,7 +42,7 @@ void rtppacket::copy( rtppacket *src )
           src->pk + 12 + ( src->getpacketcsrccount() * 4 ),
           src->getpayloadlength() );
 
-  this->length = src->getpayloadlength() + 12 + ( this->getpacketcsrccount() * 4 );
+  this->length = src->length;
 }
 
 /*!md
@@ -139,28 +138,11 @@ uint8_t rtppacket::getpayloadtype( void )
 /*!md
 ## setpayloadtype
 As it says. We also set the length of the packet to a default amount for that CODEC.
+If setting a dynamic payloadtype - don't mess with the length as we won't know it 
+and it must already be set.
 */
-void rtppacket::setpayloadtype( uint8_t pt )
-{
+void rtppacket::setpayloadtype( uint8_t pt ) {
   this->pk[ 1 ] = ( this->pk[ 1 ] & 0x80 ) | ( pt & 0x7f );
-
-  switch( pt )
-  {
-    case ILBC20PAYLOADBYTES:
-    {
-      this->length = 12 + ILBC20PAYLOADBYTES;
-      break;
-    }
-    case ILBC30PAYLOADBYTES:
-    {
-      this->length = 12 + ILBC30PAYLOADBYTES;
-      break;
-    }
-    default:
-    {
-      this->length = 12 + G711PAYLOADBYTES;
-    }
-  }
 }
 
 /*!md
@@ -243,8 +225,7 @@ uint32_t rtppacket::getcsrc( uint8_t index )
 ## getpayload
 Returns a pointer to the start of the payload.
 */
-uint8_t *rtppacket::getpayload( void )
-{
+uint8_t *rtppacket::getpayload( void ) {
   uint8_t *ptr = this->pk;
   ptr += 12;
   ptr += ( this->getpacketcsrccount() * 4 );
@@ -256,11 +237,9 @@ uint8_t *rtppacket::getpayload( void )
 ## getpayloadlength
 As it says.
 */
-uint16_t rtppacket::getpayloadlength( void )
-{
+uint16_t rtppacket::getpayloadlength( void ) {
 
-  if( this->length < ( 12 - ( (size_t)this->getpacketcsrccount() * 4 ) ) )
-  {
+  if( this->length < ( 12 - ( (size_t) this->getpacketcsrccount() * 4 ) ) ) {
     fprintf( stderr, "RTP Packet has a nonsense size\n" );
     return 0;
   }
@@ -271,30 +250,26 @@ uint16_t rtppacket::getpayloadlength( void )
 ## setpayloadlength
 As it says.
 */
-void rtppacket::setpayloadlength( size_t length )
-{
+void rtppacket::setpayloadlength( size_t length ) {
   this->length = 12 + ( this->getpacketcsrccount() * 4 ) + length;
 }
 
-#ifdef TESTSUITE
-/* show the contents to cout */
+/* dump the contents to cout */
 void rtppacket::dump() {
   std::cout << "=================BEGIN=================" << std::endl;
-  std::cout << "length: " << this->length << std::endl;
-  std::cout << "payload length: " << this->getpayloadlength() << std::endl;
+  std::cout << "length: " << std::dec << this->length << std::endl;
+  std::cout << "payload length: " << std::dec << this->getpayloadlength() << std::endl;
   std::cout << "marker: " << +this->getpacketmarker() << std::endl;
   std::cout << "pt: " << +this->getpayloadtype() << std::endl;
-  std::cout << "sn: " << this->getsequencenumber() << std::endl;
-  std::cout << "ts: " << this->gettimestamp() << std::endl;
-  std::cout << "ssrc: " << this->getssrc() << std::endl;
+  std::cout << "sn: " << std::dec << this->getsequencenumber() << std::endl;
+  std::cout << "ts: " << std::dec << this->gettimestamp() << std::endl;
+  std::cout << "ssrc: " << std::dec << this->getssrc() << std::endl;
 
   auto v = this->getpayload();
   for( auto i = 0; i < this->getpayloadlength(); i ++ ) {
     std::cout << std::showbase << std::setfill( '0' ) << std::setw( 2 ) << std::hex << std::right << +(*(v+i)) << ' ';
-    if( 0 == i % 16 ) std::cout << std::endl;
+    if( 0 != i && 0 == i % 16 ) std::cout << std::endl;
   }
   std::cout << std::dec;
-
   std::cout << std::endl << "=================END===================" << std::endl;
 }
-#endif

package/src/projectrtppacket.h

@@ -45,9 +45,7 @@ public:
   void copy( rtppacket *src );
   void copy( uint8_t *src, size_t len );
   void copyheader( rtppacket *src );
-#ifdef TESTSUITE
   void dump();
-#endif
 
 };
 

package/src/projectrtprawsound.cpp

@@ -1,5 +1,7 @@
 
 #include <iostream>   // cerr
+#include <cstdlib>
+#include <iomanip>
 
 #include "projectrtprawsound.h"
 #include "projectrtpcodecx.h"
@@ -145,24 +147,17 @@ rawsound::~rawsound()
 ## zero
 Reset buffer with zero
 */
-void rawsound::zero( void )
-{
-  if( nullptr != this->data )
-  {
-    size_t zeroamount = this->samples * this->bytespersample;
-    if( L1616KPAYLOADTYPE == format )
-    {
-      zeroamount = zeroamount * 2;
-    }
+void rawsound::zero( void ) {
+  if( nullptr == this->data ) return;
 
-    if( 0 != this->allocatedlength && zeroamount > this->allocatedlength )
-    {
-      std::cerr << "Trying to zero memory but capped by allocated amount" << std::endl;
-      zeroamount = this->allocatedlength;
-    }
+  size_t zeroamount = this->samples * this->bytespersample;
 
-    memset( this->data, 0, zeroamount );
+  if( 0 != this->allocatedlength && zeroamount > this->allocatedlength ) {
+    std::cerr << "Trying to zero memory but capped by allocated amount" << std::endl;
+    zeroamount = this->allocatedlength;
   }
+
+  memset( this->data, 0, zeroamount );
 }
 
 /*
@@ -170,49 +165,31 @@ void rawsound::zero( void )
 * Target (this) MUST have memory available.
 * format must be set appropriatly before the call
 */
-void rawsound::copy( uint8_t *src, size_t len )
-{
-  if( nullptr != this->data )
-  {
-    memcpy( this->data,
-            src,
-            len );
+void rawsound::copy( uint8_t *src, size_t len ) {
+  if( nullptr == this->data ) return;
 
-    switch( this->format )
-    {
-      case L168KPAYLOADTYPE:
-      case L1616KPAYLOADTYPE:
-      {
-        this->samples = len / 2;
-        break;
-      }
-      default:
-      {
-        this->samples = len;
-        break;
-      }
-    }
-  }
+  memcpy( this->data,
+          src,
+          len );
 }
 
 /*
 ## copy (from other)
 * Target (this) MUST have data allocated.
 */
-void rawsound::copy( rawsound &other )
-{
-  if( nullptr != this->data && this->samples >= other.samples )
-  {
-    this->bytespersample = other.bytespersample;
-    this->samplerate = other.samplerate;
-    this->format = other.format;
-    this->samples = other.samples;
+void rawsound::copy( rawsound &other ) {
 
-    memcpy( this->data,
-            other.data,
-            other.samples * other.bytespersample );
+  if( nullptr == this->data || this->samples < other.samples ) return;
+
+  this->bytespersample = other.bytespersample;
+  this->samplerate = other.samplerate;
+  this->format = other.format;
+  this->samples = other.samples;
+
+  memcpy( this->data,
+          other.data,
+          other.samples * other.bytespersample );
 
-  }
 }
 
 /*
@@ -235,21 +212,14 @@ void rawsound::subtract( void )
 ## malloc
 Allocate our own memory.
 */
-void rawsound::malloc( size_t samplecount, size_t bytespersample, int format )
-{
+void rawsound::malloc( size_t samplecount, size_t bytespersample, int format ) {
   this->samples = samplecount;
   this->bytespersample = bytespersample;
   this->format = format;
   size_t requiredsize = samplecount * bytespersample;
-  if( L1616KPAYLOADTYPE == format )
-  {
-    requiredsize = requiredsize * 2;
-  }
 
-  if( this->allocatedlength > 0 )
-  {
-    if( this->allocatedlength >= requiredsize )
-    {
+  if( this->allocatedlength > 0 ) {
+    if( this->allocatedlength >= requiredsize ) {
       return;
     }
 
@@ -263,46 +233,39 @@ void rawsound::malloc( size_t samplecount, size_t bytespersample, int format )
 ## operator +=
 Used for mixing audio
 */
-rawsound& rawsound::operator+=( codecx& rhs )
-{
+rawsound& rawsound::operator+=( codecx& rhs ) {
   size_t length;
 
   int16_t *in;
   int16_t *out = ( int16_t * ) this->data;
 
-  switch( this->format )
-  {
-    case L168KPAYLOADTYPE:
-    {
+  switch( this->format ) {
+    case L168KPAYLOADTYPE: {
       rhs.requirenarrowband();
-
+      if( rhs.l168kref.isdirty() ) return *this;
       length = rhs.l168kref.size();
       in = ( int16_t * ) rhs.l168kref.c_str();
       break;
     }
-    case L1616KPAYLOADTYPE:
-    {
+    case L1616KPAYLOADTYPE: {
       rhs.requirewideband();
-
+      if( rhs.l1616kref.isdirty() ) return *this;
       length = rhs.l1616kref.size();
       in = ( int16_t * ) rhs.l1616kref.c_str();
       break;
     }
-    default:
-    {
+    default: {
       std::cerr << "Attemping to perform an addition on a none linear format" << std::endl;
       return *this;
     }
   }
 
-  if( length > this->samples )
-  {
+  if( length > this->samples ) {
     std::cerr << "We have been asked to add samples but we don't have enough space" << std::endl;
     length = this->samples;
   }
 
-  for( size_t i = 0; i < length; i++ )
-  {
+  for( size_t i = 0; i < length; i++ ) {
     *out++ += *in++;
   }
 
@@ -354,3 +317,21 @@ rawsound& rawsound::operator-=( codecx& rhs )
 
   return *this;
 }
+
+
+void rawsound::dump() {
+
+  std::cout << "=================BEGIN=================" << std::endl;
+  std::cout << "samples: " << std::dec << this->samples << std::endl;
+  std::cout << "bytespersample: " << std::dec << this->bytespersample << std::endl;
+  std::cout << "format: " << std::dec << this->format << std::endl;
+  
+  auto v = this->data;
+  size_t len = this->samples * this->bytespersample;
+  for( size_t i = 0; i < len; i ++ ) {
+    std::cout << std::showbase << std::setfill( '0' ) << std::setw( 2 ) << std::hex << std::right << +(*(v+i)) << ' ';
+    if( 0 != i && 0 == i % 16 ) std::cout << std::endl;
+  }
+  std::cout << std::dec;
+  std::cout << std::endl << "=================END===================" << std::endl;
+}

package/src/projectrtprawsound.h

@@ -6,8 +6,7 @@
 #include "projectrtppacket.h"
 
 class codecx;
-class rawsound
-{
+class rawsound {
 public:
   rawsound();
   rawsound( uint8_t *ptr, std::size_t samples, int format, uint16_t samplerate );
@@ -39,6 +38,8 @@ public:
   rawsound& operator+=( codecx& rhs );
   rawsound& operator-=( codecx& rhs );
 
+  void dump();
+
 private:
   void frompt( int payloadtype );
 

package/src/projectrtpsoundfile.cpp

@@ -605,7 +605,10 @@ static napi_value wavinfo( napi_env env, napi_callback_info info ) {
     return NULL;
   }
 
-  read( fd, &hd, sizeof( wavheader ) );
+  if( sizeof( wavheader ) != read( fd, &hd, sizeof( wavheader ) ) ) {
+    napi_throw_type_error( env, "0", "Bad wav header" );
+    goto done;
+  }
 
   if( 'R' != hd.riff_header[ 0 ] ||
       'I' != hd.riff_header[ 1 ] ||

package/src/projectrtptonegen.cpp

@@ -51,13 +51,11 @@ static void gentone( int16_t *outbuffer, int sizeofblock, double startfrequency,
 }
 
 
-static void gen( std::string tone, std::string filename )
-{
+static void gen( std::string tone, std::string filename ) {
   vectorofstrings freqscadence;
   boost::split( freqscadence, tone, boost::is_any_of( ":" ) );
 
-  if( 2 != freqscadence.size() )
-  {
+  if( 2 != freqscadence.size() ) {
     std::cerr << "You must supply a cadence, eg. 400:1000" << std::endl;
     return;
   }
@@ -76,8 +74,7 @@ static void gen( std::string tone, std::string filename )
   vectorofstrings cadenceparts;
   int cadencepos = 0;
   int cadencetotal = 0;
-  for( it = frequencies.begin(); it != frequencies.end(); it++ )
-  {
+  for( it = frequencies.begin(); it != frequencies.end(); it++ ) {
     cadencetotal += std::atoi( cadences[ cadencepos ].c_str() );
     cadencepos = ( cadencepos + 1 ) % cadences.size();
   }
@@ -94,8 +91,7 @@ static void gen( std::string tone, std::string filename )
   /* 3. Generate tones */
   int pos = 0;
   cadencepos = 0;
-  for( it = frequencies.begin(); it != frequencies.end(); it++ )
-  {
+  for( it = frequencies.begin(); it != frequencies.end(); it++ ) {
     /* Current cadence. */
     int cadence = std::atoi( cadences[ cadencepos ].c_str() );
     cadencepos = ( cadencepos + 1 ) % cadences.size();
@@ -109,14 +105,12 @@ static void gen( std::string tone, std::string filename )
     boost::split( freqamp, *it, boost::is_any_of( "*" ) );
     double startamp = 1;
     double endamp = 1;
-    if( freqamp.size() > 1 )
-    {
+    if( freqamp.size() > 1 ) {
       vectorofstrings ampfromto;
       boost::split( ampfromto, freqamp[ 1 ], boost::is_any_of( "~" ) );
       startamp = std::atof( ampfromto[ 0 ].c_str() );
       endamp = startamp;
-      if( ampfromto.size() > 1 )
-      {
+      if( ampfromto.size() > 1 ) {
         endamp = std::atof( ampfromto[ 1 ].c_str() );
       }
     }
@@ -127,27 +121,20 @@ static void gen( std::string tone, std::string filename )
     double endfreq = -1;
 
     std::size_t found = freqamp[ 0 ].find_first_of( "+x~" );
-    if( std::string::npos == found )
-    {
+    if( std::string::npos == found ) {
       startfreq = std::atof( freqparts[ 0 ].c_str() );
       gentone( outbuffer, sizeofblock, startfreq, startfreq, startamp, endamp, outwavheader.sample_rate );
       goto continueloop;
-    }
-    else
-    {
-      switch( freqamp[ 0 ][ found ] )
-      {
-        case '+':
-        {
-          for( auto freqit = freqparts.begin(); freqit != freqparts.end(); freqit++ )
-          {
+    } else {
+      switch( freqamp[ 0 ][ found ] ) {
+        case '+': {
+          for( auto freqit = freqparts.begin(); freqit != freqparts.end(); freqit++ ) {
             startfreq = std::atof( freqit->c_str() );
             gentone( outbuffer, sizeofblock, startfreq, startfreq, startamp, endamp, outwavheader.sample_rate );
           }
           break;
         }
-        case '~':
-        {
+        case '~': {
           startfreq = std::atof( freqparts[ 0 ].c_str() );
           endfreq = std::atof( freqparts[ 1 ].c_str() );
           gentone( outbuffer, sizeofblock, startfreq, endfreq, startamp, endamp, outwavheader.sample_rate );
@@ -164,39 +151,35 @@ continueloop:
   /* Write */
   int file = open( filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR );
   off_t position = lseek( file, 0, SEEK_END );
-  if( 0 == position )
-  {
-    write( file, &outwavheader, sizeof( wavheader ) );
-    write( file, readbuffer, outwavheader.chunksize );
-  }
-  else
-  {
+  if( 0 == position ) {
+    if( -1 == write( file, &outwavheader, sizeof( wavheader ) ) ) std::cerr <<  "Error writing to tone file" << std::endl;
+    if( -1 == write( file, readbuffer, outwavheader.chunksize ) ) std::cerr <<  "Error writing to tone file" << std::endl;
+  } else {
     wavheader currentheader;
     lseek( file, 0, SEEK_SET );
-    read( file, &currentheader, sizeof( wavheader ) );
+    if( sizeof( wavheader ) != read( file, &currentheader, sizeof( wavheader ) ) ) {
+      std::cerr << "Error reading existing tone file" << std::endl;
+      goto cleanuupgen;
+    }
     lseek( file, 0, SEEK_END );
 
     if( currentheader.audio_format == outwavheader.audio_format &&
-          currentheader.sample_rate == outwavheader.sample_rate )
-    {
+          currentheader.sample_rate == outwavheader.sample_rate ) {
       /* Ok, good enough! */
       currentheader.chunksize += outwavheader.chunksize;
       currentheader.subchunksize += outwavheader.subchunksize;
 
       lseek( file, 0, SEEK_SET );
-      write( file, &currentheader, sizeof( wavheader ) );
+      if( -1 == write( file, &currentheader, sizeof( wavheader ) ) ) std::cerr << "Error writing to tone file" << std::endl;
       lseek( file, 0, SEEK_END );
-      write( file, readbuffer, outwavheader.chunksize );
-    }
-    else
-    {
+      if( -1 == write( file, readbuffer, outwavheader.chunksize ) ) std::cerr << "Error writing to tone file" << std::endl;
+    } else {
       std::cerr << "File format to append should be the same" << std::endl;
     }
   }
 
-  /* Clean up */
-  if( nullptr != readbuffer )
-  {
+cleanuupgen:
+  if( nullptr != readbuffer ) {
     delete[] readbuffer;
   }
 

package/test/interface/pcap.js

@@ -132,9 +132,9 @@ module.exports.readpcap = async ( file, maxnumberofpackets = 5000 ) => {
           etherpacket.ipv4.udp = {}
           etherpacket.ipv4.udp.srcport = parseInt( toHex( etherpacket.ipv4.data[ 20 ] ) + toHex( etherpacket.ipv4.data[ 21 ] ), 16 )
           etherpacket.ipv4.udp.dstport = parseInt( toHex( etherpacket.ipv4.data[ 22 ] ) + toHex( etherpacket.ipv4.data[ 23 ] ), 16 )
-          etherpacket.ipv4.udp.length = parseInt( toHex( etherpacket.ipv4.data[ 24 ] ) + toHex( etherpacket.ipv4.data[ 25 ] ), 16 )
+          etherpacket.ipv4.udp.length = parseInt( toHex( etherpacket.ipv4.data[ 24 ] ) + toHex( etherpacket.ipv4.data[ 25 ] ), 16 ) - /* udp header */ 8
           etherpacket.ipv4.udp.checksum = parseInt( toHex( etherpacket.ipv4.data[ 26 ] ) + toHex( etherpacket.ipv4.data[ 27 ] ), 16 )
-          etherpacket.ipv4.udp.data = etherpacket.ipv4.data.subarray( 28, 28 + etherpacket.ipv4.data.length )
+          etherpacket.ipv4.udp.data = etherpacket.ipv4.data.subarray( 28, 28 + etherpacket.ipv4.udp.length )
           break
         case 6:
           /* TCP */

package/test/interface/projectrtpchannel.js

@@ -381,8 +381,7 @@ describe( "rtpchannel", function() {
       lastts = ts
 
       receviedpkcount++
-      //console.log(receviedpkcount, sn, ts)
-      if( 185 == receviedpkcount ) channel.close()
+
     } )
 
     this.timeout( 15000 )
@@ -390,8 +389,7 @@ describe( "rtpchannel", function() {
 
     server.bind()
 
-    let done
-    const finished = new Promise( ( r ) => done = r )
+
     let closedstats = {}
     server.on( "listening", async function() {
 
@@ -402,7 +400,6 @@ describe( "rtpchannel", function() {
         if( "close" === d.action ) {
           closedstats = d
           server.close()
-          done()
         }
       } )
 
@@ -410,7 +407,7 @@ describe( "rtpchannel", function() {
 
       /* send a packet every 20mS x 50 */
       let i
-      for( i = 0; 50 > i; i++ ) {
+      for( i = 0; 120 > i; i++ ) {
         sendpk( i, i, channel.local.port, server )
       }
 
@@ -425,7 +422,10 @@ describe( "rtpchannel", function() {
       }
     } )
 
-    await finished
+    await new Promise( resolve => setTimeout( resolve, 6500 ) )
+    // @ts-ignore
+    channel.close()
+    await new Promise( resolve => setTimeout( resolve, 50 ) )
 
     /*
       We should receive
@@ -435,10 +435,10 @@ describe( "rtpchannel", function() {
     */
     expect( receviedpkcount ).to.equal( closedstats.stats.out.count )
     expect( closedstats.stats.in.count ).to.equal( 300 )
-    expect( closedstats.stats.out.count ).to.be.within( 180, 190 )
+    expect( closedstats.stats.out.count ).to.be.above( 250 )
     expect( totalsndiff ).to.equal( 0 ) // received should be reordered
-    expect( totaltsdiff ).to.be.within( 18240, 18400 ) // Allow some loss in test
-    expect( lastsn - firstsn ).to.be.within( 180, 192 )
+    expect( totaltsdiff ).to.be.within( 5000, 18400 ) // Allow some loss in test
+    expect( lastsn - firstsn ).to.be.within( 250, 300 )
   } )
 
   it( "create channel echo whilst wrapping the sn", function( done ) {