cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwAudioBuf.h/cpp : Added damping to meter calculation and create() arg. 'meterDampCoeff'.

Browse Source
This commit is contained in:
kevin 2025-04-19 13:46:13 -04:00
parent f7283ffcca
commit 2d749cabeb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cwAudioBuf.cpp
View File

@ -103,6 +103,8 @@ namespace cw
sample_t* zeroBuf; // buffer of zeros sample_t* zeroBuf; // buffer of zeros
unsigned zeroBufCnt; // max of all dspFrameCnt for all devices. unsigned zeroBufCnt; // max of all dspFrameCnt for all devices.
float meter_damp_coeff;
} audioBuf_t; } audioBuf_t;
inline audioBuf_t* _handleToPtr( handle_t h ) { return handleToPtr<handle_t,audioBuf_t>(h); } inline audioBuf_t* _handleToPtr( handle_t h ) { return handleToPtr<handle_t,audioBuf_t>(h); }
@ -263,7 +265,7 @@ namespace cw
} }
} }
cw::rc_t cw::audio::buf::create( handle_t& hRef, unsigned devCnt, unsigned meterMs ) cw::rc_t cw::audio::buf::create( handle_t& hRef, unsigned devCnt, unsigned meterMs, float meterDampCoeff )
{ {
rc_t rc; rc_t rc;
@ -274,7 +276,8 @@ cw::rc_t cw::audio::buf::create( handle_t& hRef, unsigned devCnt, unsigned meter
p->devArray = mem::allocZ<cmApDev>(devCnt ); p->devArray = mem::allocZ<cmApDev>(devCnt );
p->devCnt = devCnt; p->devCnt = devCnt;
p->meter_damp_coeff = meterDampCoeff;
hRef.set(p); hRef.set(p);
setMeterMs(hRef,meterMs); setMeterMs(hRef,meterMs);
@ -422,11 +425,10 @@ cw::rc_t cw::audio::buf::update(
sample_t* dp = cp->b + cp->ii; sample_t* dp = cp->b + cp->ii;
const sample_t* ep = dp + n0; const sample_t* ep = dp + n0;
// update the meter // update the meter
if( cwIsFlag(cp->fl,kMeterFl) ) if( cwIsFlag(cp->fl,kMeterFl) )
{ {
cp->m[cp->mi] = _cmApMeter(sp,pp->audioFramesCnt,pp->chCnt); cp->m[cp->mi] = (1.0f - p->meter_damp_coeff) * cp->m[cp->mi] + p->meter_damp_coeff*_cmApMeter(sp,pp->audioFramesCnt,pp->chCnt);
cp->mi = (cp->mi + 1) % cp->mn; cp->mi = (cp->mi + 1) % cp->mn;
} }
@ -538,7 +540,9 @@ cw::rc_t cw::audio::buf::update(
// update the meter // update the meter
if( cwIsFlag(cp->fl,kMeterFl) ) if( cwIsFlag(cp->fl,kMeterFl) )
{ {
cp->m[cp->mi] = _cmApMeter(((sample_t*)pp->audioBytesPtr)+j,pp->audioFramesCnt,pp->chCnt); //cp->m[cp->mi] = _cmApMeter(((sample_t*)pp->audioBytesPtr)+j,pp->audioFramesCnt,pp->chCnt);
cp->m[cp->mi] = (1.0f - p->meter_damp_coeff) * cp->m[cp->mi] + p->meter_damp_coeff*_cmApMeter(((sample_t*)pp->audioBytesPtr)+j,pp->audioFramesCnt,pp->chCnt);
cp->mi = (cp->mi + 1) % cp->mn; cp->mi = (cp->mi + 1) % cp->mn;
} }

2
cwAudioBuf.h
View File

@ -66,7 +66,7 @@ namespace cw
// Allocate and initialize an audio buffer. // Allocate and initialize an audio buffer.
// devCnt - count of devices this buffer will handle. // devCnt - count of devices this buffer will handle.
// meterMs - length of the meter buffers in milliseconds (automatically limit to the range:10 to 1000) // meterMs - length of the meter buffers in milliseconds (automatically limit to the range:10 to 1000)
rc_t create( handle_t& hRef, unsigned devCnt, unsigned meterMs ); rc_t create( handle_t& hRef, unsigned devCnt, unsigned meterMs, float meterDampCoeff=0.4 );
// Deallocate and release any resource held by an audio buffer allocated via initialize(). // Deallocate and release any resource held by an audio buffer allocated via initialize().
rc_t destroy( handle_t& hRef ); rc_t destroy( handle_t& hRef );