cwAudioFileProc.h : Reformatted code.

Makefile.am

@@ -68,8 +68,8 @@ libcwSRC += src/libcw/cwAudioDeviceAlsa.cpp src/libcw/cwAudioDeviceFile.cpp src/
 
 
 if cwWEBSOCK
-libcwHDR += src/libcw/cwIo.h   src/libcw/cwIoTest.h     src/libcw/cwIoMinTest.h   src/libcw/cwIoSocketChat.h   src/libcw/cwIoAudioPanel.h    src/libcw/cwIoAudioMidi.h
-libcwSRC += src/libcw/cwIo.cpp src/libcw/cwIoTest.cpp   src/libcw/cwIoMinTest.cpp src/libcw/cwIoSocketChat.cpp src/libcw/cwIoAudioPanel.cpp  src/libcw/cwIoAudioMidi.cpp
+libcwHDR += src/libcw/cwIo.h   src/libcw/cwIoTest.h     src/libcw/cwIoMinTest.h   src/libcw/cwIoSocketChat.h   src/libcw/cwIoAudioPanel.h
+libcwSRC += src/libcw/cwIo.cpp src/libcw/cwIoTest.cpp   src/libcw/cwIoMinTest.cpp src/libcw/cwIoSocketChat.cpp src/libcw/cwIoAudioPanel.cpp
 
 libcwHDR += src/libcw/cwIoMidiRecordPlay.h    src/libcw/cwIoAudioRecordPlay.h   src/libcw/cwIoAudioMidiApp.h    src/libcw/cwIoFlow.h   src/libcw/cwIoFlowCtl.h
 libcwSRC += src/libcw/cwIoMidiRecordPlay.cpp  src/libcw/cwIoAudioRecordPlay.cpp src/libcw/cwIoAudioMidiApp.cpp  src/libcw/cwIoFlow.cpp src/libcw/cwIoFlowCtl.cpp 

cwAudioDeviceFile.cpp

@@ -1105,6 +1105,7 @@ cw::rc_t cw::audio::device::file::test( const object_t* cfg)
   rc_t               rc2            = kOkRC;
   const char*        ifname         = nullptr;
   const char*        ofname         = nullptr;
+  unsigned           cycleCnt       = 0;
   struct driver_str  driver         = {};
   struct driver_str* driver_ptr     = &driver;
   unsigned           bitsPerSample  = 0; // zero indicates floating point sample format for output audio file
@@ -1120,7 +1121,8 @@ cw::rc_t cw::audio::device::file::test( const object_t* cfg)
   // parse the test args
   if((rc = cfg->getv("inAudioFname",ifname,
                      "outAudioFname",ofname,
-                     "framesPerCycle",framesPerCycle)) != kOkRC || ifname==nullptr || ofname==nullptr )
+                     "framesPerCycle",framesPerCycle,
+                     "cycleCnt",cycleCnt)) != kOkRC || ifname==nullptr || ofname==nullptr )
   {
     rc = cwLogError(rc,"Parsing audiio device file test cfg. failed.");
     goto errLabel;
@@ -1176,7 +1178,7 @@ cw::rc_t cw::audio::device::file::test( const object_t* cfg)
   }
 
   // run the audio device file
-  for(unsigned i=0; i<10; ++i)
+  for(unsigned i=0; i<cycleCnt; ++i)
   {
     deviceExecute( driver_ptr, devIdx );
     deviceRealTimeReport( driver_ptr, devIdx );

cwAudioFileOps.cpp

@@ -129,6 +129,8 @@ namespace cw
       }
       else
       {
+        assert( frmN >= fadeFrmN );
+        
         // count backward
         i0 = (int)fadeFrmN;
         d    = -1;
@@ -384,7 +386,12 @@ cw::rc_t       cw::afop::mix( const object_t* cfg )
   return rc;
 }
 
-cw::rc_t  cw::afop::selectToFile( const char* srcFn, double beg0Sec, double beg1Sec, double end0Sec, double end1Sec, unsigned outBits, const char* outDir, const char* outFn )
+cw::rc_t  cw::afop::selectToFile( const char* srcFn,                 // source audio file
+                                  double beg0Sec, double beg1Sec,    // begin cross-fade
+                                  double end0Sec, double end1Sec,    // end cross-fade
+                                  unsigned outBits,                  // output sample word bits 
+                                  const char* outDir,                // output directory
+                                  const char* outFn )                // output filename
 {
   rc_t                rc     = kOkRC;
   char*               iFn    = filesys::expandPath(srcFn);
@@ -465,11 +472,13 @@ cw::rc_t  cw::afop::selectToFile( const char* srcFn, double beg0Sec, double beg1
     // if there is a fade-out then generate it
     if( end1FrmIdx > end0FrmIdx )
     {
+      assert( actualBufFrmN >= (end1FrmIdx - end0FrmIdx) );
+      
       float*  fadeChBuf[ info.chCnt ];
       for(unsigned i = 0; i<info.chCnt; ++i)
         fadeChBuf[i] = chBuf[i] + actualBufFrmN - (end1FrmIdx - end0FrmIdx);
       
-      _fadeAllChannels( fadeChBuf, info.chCnt, ttlFrmN, end1FrmIdx-end0FrmIdx, kLinearFadeFl | kFadeOutFl );
+      _fadeAllChannels( fadeChBuf, info.chCnt, end1FrmIdx-end0FrmIdx, end1FrmIdx-end0FrmIdx, kLinearFadeFl | kFadeOutFl );
     }
     
     // write the buffer to the output file
@@ -674,7 +683,11 @@ cw::rc_t cw::afop::cutAndMix( const object_t* cfg )
   unsigned        i;
   
   // read the top level cfg record
-  if((rc = cfg->getv("dstFn",dstFn,"dstBits",dstBits,"srcDir",srcDir,"crossFadeSec",crossFadeSec,"argL",argNodeL)) != kOkRC )
+  if((rc = cfg->getv("dstFn",dstFn,
+                     "dstBits",dstBits,
+                     "srcDir",srcDir,
+                     "crossFadeSec",crossFadeSec,
+                     "argL",argNodeL)) != kOkRC )
     goto errLabel;
 
   if( argNodeL == nullptr )
@@ -692,20 +705,24 @@ cw::rc_t cw::afop::cutAndMix( const object_t* cfg )
       const object_t* o = argNodeL->child_ele(i);
 
       // parse the non-optional parameters
-      if((rc = o->getv("srcBegSec", argL[i].srcBegSec, "srcEndSec", argL[i].srcEndSec, "srcFn", argL[i].srcFn  )) != kOkRC )
+      if((rc = o->getv("srcBegSec", argL[i].srcBegSec,
+                       "srcEndSec", argL[i].srcEndSec,
+                       "srcFn", argL[i].srcFn  )) != kOkRC )
       {
         rc = cwLogError(kInvalidArgRC,"Invalid crossfade argument at argument index %i.",i);
       }
       else
-      {
-        
+      {        
         argL[i].dstBegSec     = argL[i].srcBegSec; // By default the src is moved to the same location 
         argL[i].srcBegFadeSec = crossFadeSec;      // By default the beg/end fade is the global fade time. 
         argL[i].srcEndFadeSec = crossFadeSec;
         argL[i].gain          = 1;
 
         // parse the optional parameters
-        if((rc = o->getv_opt("dstBegSec", argL[i].dstBegSec, "srcBegFadeSec", argL[i].srcBegFadeSec, "srcEndFadeSec", argL[i].srcEndFadeSec, "gain", argL[i].gain  )) != kOkRC )
+        if((rc = o->getv_opt("dstBegSec", argL[i].dstBegSec,
+                             "srcBegFadeSec", argL[i].srcBegFadeSec,
+                             "srcEndFadeSec", argL[i].srcEndFadeSec,
+                             "gain", argL[i].gain  )) != kOkRC )
         {
           rc = cwLogError(kInvalidArgRC,"Invalid crossfade optional argument at argument index %i.",i);
         }
@@ -773,7 +790,10 @@ cw::rc_t cw::afop::parallelMix( const object_t* cfg )
   unsigned        i;
 
   // read the top level cfg record
-  if((rc = cfg->getv("dstFn",dstFn,"dstBits",dstBits,"srcDir",srcDir,"argL",argNodeL)) != kOkRC )
+  if((rc = cfg->getv("dstFn",dstFn,
+                     "dstBits",dstBits,
+                     "srcDir",srcDir,
+                     "argL",argNodeL)) != kOkRC )
     goto errLabel;
 
   if( argNodeL == nullptr )
@@ -849,7 +869,15 @@ cw::rc_t cw::afop::transformApp( const object_t* cfg )
   unsigned        i;
 
   // read the top level cfg record
-  if((rc = cfg->getv("dstPreFn",dstPreFn,"dstRevFn",dstRevFn,"dstBits",dstBits,"srcDir",srcDir,"argL",argNodeL,"dryFn",dryFn,"irEnableFl",irEnableFl,"irFn",irFn,"irScale",irScale)) != kOkRC )
+  if((rc = cfg->getv("dstPreFn",dstPreFn,
+                     "dstRevFn",dstRevFn,
+                     "dstBits",dstBits,
+                     "srcDir",srcDir,
+                     "argL",argNodeL,
+                     "dryFn",dryFn,
+                     "irEnableFl",irEnableFl,
+                     "irFn",irFn,
+                     "irScale",irScale)) != kOkRC )
     goto errLabel;
 
 
@@ -1021,7 +1049,11 @@ cw::rc_t cw::afop::convolve( const object_t* cfg )
   
 
   // read the top level cfg record
-  if((rc = cfg->getv("dstFn",dstFn,"dstBits",dstBits,"srcFn",srcFn,"irFn",irFn,"irScale",irScale)) != kOkRC )
+  if((rc = cfg->getv("dstFn",dstFn,
+                     "dstBits",dstBits,
+                     "srcFn",srcFn,
+                     "irFn",irFn,
+                     "irScale",irScale)) != kOkRC )
   {
     cwLogError(rc,"convolve() arg. parse failed.");
   }
@@ -1056,7 +1088,13 @@ cw::rc_t cw::afop::generate( const object_t* cfg )
   const object_t* clickNode= nullptr;
   
   // read the top level cfg record
-  if((rc = cfg->getv("dstFn",dstFn,"dstBits",dstBits,"dstSrate",dstSrate,"dstSecs",dstSecs,"op",opLabel,"sine",sineNode,"click",clickNode)) != kOkRC )
+  if((rc = cfg->getv("dstFn",dstFn,
+                     "dstBits",dstBits,
+                     "dstSrate",dstSrate,
+                     "dstSecs",dstSecs,
+                     "op",opLabel,
+                     "sine",sineNode,
+                     "click",clickNode)) != kOkRC )
   {
     cwLogError(rc,"generate() arg. parse failed.");
   }
@@ -1128,10 +1166,53 @@ cw::rc_t cw::afop::generate( const object_t* cfg )
 cw::rc_t cw::afop::test( const object_t* cfg )
 {
   rc_t rc = kOkRC;
-  const object_t* o;
-  
-  if((o = cfg->find("sine")) != nullptr )
-    rc = sine(o);
 
+  typedef rc_t (*func_t)( const object_t* cfg );
+  typedef struct map_str {
+    const char* label;
+    func_t func;
+  } map_t;
+  
+  map_t mapA[] = {
+    { "sine", sine },
+    { "mix", mix },
+    { "select_to_file",selectToFile },
+    { "cut_and_mix",cutAndMix },
+    { "parallel_mix",parallelMix },
+    { "convolve", convolve },
+    { "xfade_convolve", transformApp },
+    { "generate", generate }
+  };
+
+  unsigned mapN = sizeof(mapA)/sizeof(mapA[0]);
+  
+  for(unsigned i=0; i<cfg->child_count(); ++i)
+  {
+    const object_t* pair      = cfg->child_ele(i);
+    const map_t*    m         = std::find_if( mapA, mapA+mapN, [pair](const map_t& m){ return textIsEqual(m.label,pair->pair_label()); });
+    bool            enable_fl = false;
+
+    if( m == mapA+mapN )
+    {
+      rc = cwLogError(kInvalidArgRC,"The audio file operation '%s' is not valid.",pair->pair_label());
+      goto errLabel;
+    }
+
+    if((rc = pair->pair_value()->getv_opt("enable_fl",enable_fl)) != kOkRC )
+    {
+      goto errLabel;
+    }
+
+    if( enable_fl )
+    {
+      if((rc = m->func( pair->pair_value() )) != kOkRC )
+      {
+        goto errLabel;
+      }
+    }
+    
+  }
+  
+errLabel:
   return rc;
 }

cwAudioFileProc.h

@@ -56,7 +56,16 @@ namespace cw
     
     
     typedef rc_t (*proc_func_t)( proc_ctx_t* ctx );
-    rc_t file_processor( const char* srcFn, const char* dstFn, proc_func_t func, unsigned wndSmpN, unsigned hopSmpN, void* userArg, const object_t* args, const object_t* recorder_cfg, unsigned recordChN=0 );
+    rc_t file_processor( const char* srcFn,
+                         const char* dstFn,
+                         proc_func_t func,
+                         unsigned wndSmpN,
+                         unsigned hopSmpN,
+                         void* userArg,
+                         const object_t* args,
+                         const object_t* recorder_cfg,
+                         unsigned recordChN=0 );
+    
     rc_t file_processor( const object_t* cfg );
 
 

cwAudioTransforms.h

@@ -1023,7 +1023,9 @@ namespace cw
     //---------------------------------------------------------------------------------------------------------------------------------
     // Data Recorder
     //
-    
+    // Record frames of data and write them to a CSV file.
+    // A frame consists of 'sigN' values of type T.
+    //
     namespace data_recorder
     {
       
@@ -1042,11 +1044,11 @@ namespace cw
         struct block_str<T>* head;     // first block  
         struct block_str<T>* tail;     // last block and the one being currrently filled
         
-        unsigned             frameIdx; // index into tail of frame to fill
-        char*                fn;
-        char**               colLabelA;
-        unsigned             colLabelN;
-        bool                 enableFl;
+        unsigned             frameIdx;  // index into tail of frame to fill
+        char*                fn;        // output CSV filename
+        char**               colLabelA; // output CSV column labels
+        unsigned             colLabelN; // count of CSV column labels
+        bool                 enableFl;  
       };
 
       typedef struct obj_str<float>  fobj_t;
@@ -1071,7 +1073,13 @@ namespace cw
       }
 
       template< typename T >
-      rc_t create( struct obj_str<T>*& p, unsigned sigN, unsigned frameCacheN, const char* fn, const char** colLabelA, unsigned colLabelN, bool enableFl )
+      rc_t create( struct obj_str<T>*& p,
+                   unsigned     sigN,
+                   unsigned     frameCacheN,
+                   const char*  fn,
+                   const char** colLabelA,
+                   unsigned     colLabelN,
+                   bool         enableFl )
       {
         rc_t rc = kOkRC;
         
@@ -1152,6 +1160,11 @@ namespace cw
         return kOkRC;
       }
 
+      // Pass a partial (or full) frame of data to the object.
+      // xV[xN] is the data to record.
+      // chIdx is the first channel to write to.
+      // (xN + chIdx must be less than p->sigN)
+      // Set advance_fl to true to advance to the next frame.
       template< typename T>
       rc_t exec( struct obj_str<T>* p, const T* xV, unsigned xN, unsigned chIdx=0, bool advance_fl = true  )
       {

cwDsp.cpp

@@ -9,6 +9,7 @@
 #include "cwMath.h"
 #include "cwVectOps.h"
 #include "cwDsp.h"
+#include "cwText.h"
 
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -35,7 +36,7 @@ cw::rc_t cw::dsp::fft::test()
 
   create<real_t>(p,xN,flags);
   
-  if(p != nullptr )
+  if(p == nullptr )
   {
     rc = cwLogError(kOpFailRC,"FFT procedure allocation failed.");
     goto errLabel;
@@ -157,3 +158,31 @@ cw::rc_t cw::dsp::convolve::test()
 // 1.   0.5  0.25 0.1  1.05 0.5  0.25 0.1  1.05 0.5  0.25 0.1  0.05 0.0.   0.  ]
 // 1.0  0.5  0.25 0.1  1.05 0.5  0.25 0.1  1.05 0.5  0.25 0.1  1.05 1.0    0.75 0.
 
+
+cw::rc_t cw::dsp::test_dsp( const test::test_args_t& args )
+{
+  rc_t rc = kOkRC;
+
+  if( textIsEqual(args.test_label,"fft") )
+  {
+    rc = fft::test();
+    goto errLabel;
+  }
+  
+  if( textIsEqual(args.test_label,"ifft") )
+  {
+    rc = ifft::test();
+    goto errLabel;
+  }
+
+  if( textIsEqual(args.test_label,"convolve") )
+  {
+    rc = convolve::test();
+    goto errLabel;
+  }
+  
+  rc = cwLogError(kInvalidArgRC,"Unknown dsp test case module:%s test:%s.",args.module_label,args.test_label);
+  
+errLabel:
+  return rc;
+}

cwDsp.h

@@ -530,7 +530,7 @@ namespace cw
         for(unsigned i=0; i<binN; ++i)
           p->hV[i] = hScale * p->ft->cplxV[i] / ((T)cN);
 
-        printf("procN:%i cN:%i hN:%i binN:%i outN:%i\n", procSmpN, cN, hN, binN, p->outN );
+        //printf("procN:%i cN:%i hN:%i binN:%i outN:%i\n", procSmpN, cN, hN, binN, p->outN );
         
         return kOkRC;
       }
@@ -625,7 +625,9 @@ namespace cw
       rc_t test();
         
       
-    }    
+    }
+    
+    rc_t test_dsp( const test::test_args_t& args );
     
   }
 }

cwDspTransforms.h

@@ -105,19 +105,19 @@ namespace cw
     {
       typedef struct
       {
-	unsigned  maxWndMs;
-	unsigned  maxWndSmpN;
-	unsigned  wndSmpN;
-	sample_t* wndV;
-	srate_t   srate;
-	coeff_t    peakThreshDb;
-	coeff_t    outLin;
-	coeff_t    outDb;
-	bool      peakFl;
-	bool      clipFl;
-	unsigned  peakCnt;
-	unsigned  clipCnt;
-	unsigned  wi;
+        unsigned  maxWndMs;
+        unsigned  maxWndSmpN;
+        unsigned  wndSmpN;
+        sample_t* wndV;
+        srate_t   srate;
+        coeff_t    peakThreshDb;
+        coeff_t    outLin;
+        coeff_t    outDb;
+        bool      peakFl;
+        bool      clipFl;
+        unsigned  peakCnt;
+        unsigned  clipCnt;
+        unsigned  wi;
       } obj_t;
       
       rc_t create( obj_t*& p, srate_t srate, ftime_t maxWndMs, ftime_t wndMs, coeff_t peakThreshDb );

cwIoAudioMidi.h

@@ -1,18 +0,0 @@
-//| Copyright: (C) 2020-2024 Kevin Larke <contact AT larke DOT org> 
-//| License: GNU GPL version 3.0 or above. See the accompanying LICENSE file.
-#ifndef cwIoAudioMidi_H
-#define cwIoAudioMidi_H
-
-namespace cw
-{
-  namespace io
-  {
-    namespace audio_midi
-    {
-      rc_t main( const object_t* cfg );
-    }
-  }
-}
-
-
-#endif

cwSvg.cpp

@@ -5,10 +5,11 @@
 #include "cwCommonImpl.h"
 #include "cwMem.h"
 #include "cwFile.h"
-#include "cwSvg.h"
 #include "cwText.h"
 #include "cwTest.h"
+#include "cwObject.h"
 #include "cwNumericConvert.h"
+#include "cwSvg.h"
 
 namespace cw
 {
@@ -868,42 +869,60 @@ cw::rc_t cw::svg::write( handle_t h, const char* outFn, const char* cssFn, unsig
     return rc;  
 }
 
-cw::rc_t cw::svg::test( const char* outFn, const char* cssFn )
+cw::rc_t cw::svg::test( const cw::object_t* cfg )
 {
   rc_t     rc = kOkRC;
   handle_t h;
+
+  const char* outFn = nullptr;
+  const char* cssFn = nullptr;
+
+  if((rc = cfg->getv("outHtmlFn",outFn,
+                     "outCssFn",cssFn)) != kOkRC )
+  {
+    rc = cwLogError(rc,"SVG test parameter parsing failed.");
+    goto errLabel;
+  }
+  
   
   if((rc = create(h)) != kOkRC )
+  {
     cwLogError(rc,"SVG Test failed on create.");
+    goto errLabel;
+  }
+  else
+  {
 
+    double yV[] = { 0, 10, 30, 60, 90 };
+    double xV[] = { 0, 40, 60, 40, 10 };
+    unsigned yN = cwCountOf(yV);
 
-  double yV[] = { 0, 10, 30, 60, 90 };
-  double xV[] = { 0, 40, 60, 40, 10 };
-  unsigned yN = cwCountOf(yV);
+    install_css(h,"#my_rect","fill-opacity",0.25,nullptr);
 
-  install_css(h,"#my_rect","fill-opacity",0.25,nullptr);
-
-  rect(h,  0,  0, 100, 100, "fill",   0x7f7f7f, "rgb", "id", "my_rect", nullptr );
-  line(h,  0,  0, 100, 100, "stroke", 0xff0000, "rgb" );
-  line(h,  0,100, 100,   0, "stroke", 0x00ff00, "rgb", "stroke-width", 3, "px", "stroke-opacity", 0.5, nullptr );
-  pline(h, yV, yN,  xV,  "stroke", 0x0, "rgb", "fill-opacity", 0.25, nullptr );
-  text(h, 10, 10, "foo" );
+    rect(h,  0,  0, 100, 100, "fill",   0x7f7f7f, "rgb", "id", "my_rect", nullptr );
+    line(h,  0,  0, 100, 100, "stroke", 0xff0000, "rgb" );
+    line(h,  0,100, 100,   0, "stroke", 0x00ff00, "rgb", "stroke-width", 3, "px", "stroke-opacity", 0.5, nullptr );
+    pline(h, yV, yN,  xV,  "stroke", 0x0, "rgb", "fill-opacity", 0.25, nullptr );
+    text(h, 10, 10, "foo" );
   
-  float imgM[] = {
-    0.0f, 0.5f, 1.0f,
-    0.5f, 0.0f, 0.5f,
-    1.0f, 1.0f, 0.0f,
-    0.5f, 0.0f, 1.0f };
+    float imgM[] = {
+      0.0f, 0.5f, 1.0f,
+      0.5f, 0.0f, 0.5f,
+      1.0f, 1.0f, 0.0f,
+      0.5f, 0.0f, 1.0f };
 
-  offset( h, 10, 200 );
-  image(h, imgM, 4, 3, 20, kInvGrayScaleColorMapId );
+    offset( h, 10, 200 );
+    image(h, imgM, 4, 3, 20, kInvGrayScaleColorMapId );
   
 
-  write(h,outFn, cssFn, kStandAloneFl, 10,10,10,10);
+    write(h,outFn, cssFn, kStandAloneFl, 10,10,10,10);
+  }
   
+errLabel:
+
   if((rc = destroy(h)) != kOkRC )
-    cwLogError(rc,"SVG destroy failed.");
-  
+    rc = cwLogError(rc,"SVG destroy failed.");
+
   return rc;
   
 }

cwSvg.h

@@ -102,7 +102,7 @@ namespace cw
     enum { kStandAloneFl=0x01, kPanZoomFl=0x02, kGenCssFileFl=0x04 };
     rc_t write( handle_t h, const char* outFn, const char* cssFn, unsigned flags, double bordL=5, double bordT=5, double bordR=5, double bordB=5 );
 
-    rc_t test( const char* outFn, const char* cssFn );
+    rc_t test( const object_t* cfg );
 
   }
 }

cwTcpSocketTest.h

@@ -17,7 +17,6 @@ namespace cw
     {
       rc_t test_udp_srv( const object_t* cfg );
       rc_t test_tcp_srv( const object_t* cfg );
-      rc_t mdns_test();
     }
   }
 }

cwTest.cpp

@@ -50,6 +50,7 @@ namespace cw
       { "/filesys", filesys::test },
       { "/object",  object_test },
       { "/vop",     vop::test },
+      { "/dsp",     dsp::test_dsp },
       { "/time",    time::test },
       { "/flow",    flow::test },
       { "/textBuf", textBuf::test },