From 2ab8c68c9b8decf768dd83b3a45ab85d97279eea Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 22 Aug 2025 13:39:23 +0200 Subject: [PATCH] m-files fixed wavwrite --- matlab/osc/blip/eval_blit.m | 19 +++++++++++-------- matlab/osc/blip/eval_blit2.m | 2 +- matlab/osc/blip/eval_blit3.m | 8 ++++---- matlab/osc/blip/eval_blit4.m | 10 +++++----- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/matlab/osc/blip/eval_blit.m b/matlab/osc/blip/eval_blit.m index 7b8ed89..e3aae9e 100755 --- a/matlab/osc/blip/eval_blit.m +++ b/matlab/osc/blip/eval_blit.m @@ -2,12 +2,15 @@ function eval_blit() sinc_use_lut = 0 -L = 40000; +L = 96000; fs = 48000; -fstart = 8*440; -fend = 8*440; +fstart = 440; +fend = 440; df = (fend-fstart)/L +# for saw +rho = 0.95; + nhw = 4096; Hw = kaiser(nhw, 8)'; @@ -65,7 +68,7 @@ for n = 1:L, end end - saw = saw + fraq - blit; + saw = rho*saw + (fraq - blit); sqr = sqr + z*blit; tri = tri + 2*(sqr-0.5)*fraq; vtri(n) = tri; @@ -82,8 +85,8 @@ close all figure; plot(1:L, vsaw, 1:L, vblit); grid; -wavw16(0.5*vtri, fs, 'tri.wav'); -wavw16(0.5*vsqr, fs, 'sqr.wav'); -wavw16(0.5*vsaw, fs, 'saw.wav'); -wavw16(0.5*vblit, fs, 'blit.wav'); +wavwrite(0.5*vtri, fs, 'tri.wav'); +wavwrite(0.5*vsqr, fs, 'sqr.wav'); +wavwrite(0.5*vsaw, fs, 'saw.wav'); +wavwrite(0.5*vblit, fs, 'blit.wav'); diff --git a/matlab/osc/blip/eval_blit2.m b/matlab/osc/blip/eval_blit2.m index 6a0dbc0..02b3929 100755 --- a/matlab/osc/blip/eval_blit2.m +++ b/matlab/osc/blip/eval_blit2.m @@ -58,7 +58,7 @@ for i = 1:L, f = f + df; end; -wavw16(0.7*blit, fs, 'blit.wav'); +wavwrite(0.7*blit, fs, 'blit.wav'); for ii = 1:Nos step(ii,:) = k(ii).*filter(Hs(ii,:), 1, [ones(1,Nb)]); diff --git a/matlab/osc/blip/eval_blit3.m b/matlab/osc/blip/eval_blit3.m index f5b5753..06ce60e 100755 --- a/matlab/osc/blip/eval_blit3.m +++ b/matlab/osc/blip/eval_blit3.m @@ -9,7 +9,7 @@ df = (fend-fstart)/L; fcut = 16000; x = (0:Nb*Nphases-1) - (Nb*Nphases-1)/2; -H = sinc(2*fcut/fs.*x/Nphases);%.*Kaiser(Nphases*Nb, 8)'; +H = sinc(2*fcut/fs.*x/Nphases);%.*kaiser(Nphases*Nb, 8)'; Hw = kaiser(Nb, 18)'; for ii=0:Nphases-1, @@ -62,7 +62,7 @@ plot(saw); grid; figure; plot(saw_nodc); grid; -wavw16(0.8*blit, fs, 'blit.wav'); -wavw16(0.7*saw_nodc, fs, 'saw.wav'); -wavw16(0.5*sqr_nodc, fs, 'sqr.wav'); +wavwrite(0.8*blit, fs, 'blit.wav'); +wavwrite(0.7*saw_nodc, fs, 'saw.wav'); +wavwrite(0.5*sqr_nodc, fs, 'sqr.wav'); diff --git a/matlab/osc/blip/eval_blit4.m b/matlab/osc/blip/eval_blit4.m index 0ee3a60..e3b4582 100755 --- a/matlab/osc/blip/eval_blit4.m +++ b/matlab/osc/blip/eval_blit4.m @@ -80,9 +80,9 @@ plot(vc4); grid; figure; plot(vc3); grid; -wavw16(0.5*vc4, fs, 'c4.wav'); -wavw16(0.5*vc3, fs, 'c3.wav'); -wavw16(0.5*vsqr, fs, 'sqr.wav'); -wavw16(0.5*vsaw, fs, 'saw.wav'); -wavw16(0.5*vblit, fs, 'blit.wav'); +wavwrite(0.5*vc4, fs, 'c4.wav'); +wavwrite(0.5*vc3, fs, 'c3.wav'); +wavwrite(0.5*vsqr, fs, 'sqr.wav'); +wavwrite(0.5*vsaw, fs, 'saw.wav'); +wavwrite(0.5*vblit, fs, 'blit.wav');