zymon/PortAudio.jl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drops allocation by making the sample rate Float32

Browse source
This commit is contained in:
Spencer Russell 2014-07-01 02:32:02 -04:00
parent 6e6ca7d1fe
commit 450a9e9184
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AudioIO.jl
View file

@ -26,7 +26,7 @@ abstract AudioInterface
# Info about the hardware device # Info about the hardware device
type DeviceInfo type DeviceInfo
sample_rate::Integer sample_rate::Float32
buf_size::Integer buf_size::Integer
end end

2
src/nodes.jl
View file

@ -304,7 +304,7 @@ export LinRamp
function render(node::LinRampRenderer, device_input::AudioBuf, info::DeviceInfo) function render(node::LinRampRenderer, device_input::AudioBuf, info::DeviceInfo)
# Resize buffer if (1) it's too small or (2) we've hit the end of the ramp # Resize buffer if (1) it's too small or (2) we've hit the end of the ramp
ramp_samples = int(node.duration * info.sample_rate) ramp_samples::Int = int(node.duration * info.sample_rate)
block_samples = min(ramp_samples, info.buf_size) block_samples = min(ramp_samples, info.buf_size)
if length(node.buf) != block_samples if length(node.buf) != block_samples
resize!(node.buf, block_samples) resize!(node.buf, block_samples)

19
test/test_nodes.jl
View file

@ -85,7 +85,7 @@ facts("SinOSC") do
freq = 440 freq = 440
# note that this range includes the end, which is why there are # note that this range includes the end, which is why there are
# sample_rate+1 samples # sample_rate+1 samples
t = linspace(0, 1, test_info.sample_rate+1) t = linspace(0, 1, int(test_info.sample_rate+1))
test_vect = convert(AudioBuf, sin(2pi * t * freq)) test_vect = convert(AudioBuf, sin(2pi * t * freq))
context("Fixed Frequency") do context("Fixed Frequency") do
osc = SinOsc(freq) osc = SinOsc(freq)
@ -96,14 +96,14 @@ facts("SinOSC") do
@fact mse(render_output, @fact mse(render_output,
test_vect[test_info.buf_size+1:2*test_info.buf_size]) => test_vect[test_info.buf_size+1:2*test_info.buf_size]) =>
lessthan(MSE_THRESH) lessthan(MSE_THRESH)
@fact (@allocated render(osc, dev_input, test_info)) => 176 @fact (@allocated render(osc, dev_input, test_info)) => 64
stop(osc) stop(osc)
render_output = render(osc, dev_input, test_info) render_output = render(osc, dev_input, test_info)
@fact render_output => AudioSample[] @fact render_output => AudioSample[]
end end
context("Testing SinOsc with signal input") do context("Testing SinOsc with signal input") do
t = linspace(0, 1, test_info.sample_rate+1) t = linspace(0, 1, int(test_info.sample_rate+1))
f = 440 .- t .* (440-110) f = 440 .- t .* (440-110)
dt = 1 / test_info.sample_rate dt = 1 / test_info.sample_rate
# NOTE - this treats the phase as constant at each sample, which isn't strictly # NOTE - this treats the phase as constant at each sample, which isn't strictly
@ -123,7 +123,7 @@ facts("SinOSC") do
expected[test_info.buf_size+1:2*test_info.buf_size]) => expected[test_info.buf_size+1:2*test_info.buf_size]) =>
lessthan(MSE_THRESH) lessthan(MSE_THRESH)
# give a bigger budget here because we're rendering 2 nodes # give a bigger budget here because we're rendering 2 nodes
@fact (@allocated render(osc, dev_input, test_info)) => 448 @fact (@allocated render(osc, dev_input, test_info)) => 160
end end
end end
@ -168,7 +168,7 @@ end
facts("LinRamp") do facts("LinRamp") do
ramp = LinRamp(0.25, 0.80, 1) ramp = LinRamp(0.25, 0.80, 1)
expected = convert(AudioBuf, linspace(0.25, 0.80, test_info.sample_rate+1)) expected = convert(AudioBuf, linspace(0.25, 0.80, int(test_info.sample_rate+1)))
render_output = render(ramp, dev_input, test_info) render_output = render(ramp, dev_input, test_info)
@fact mse(render_output, expected[1:test_info.buf_size]) => @fact mse(render_output, expected[1:test_info.buf_size]) =>
lessthan(MSE_THRESH) lessthan(MSE_THRESH)
@ -176,7 +176,14 @@ facts("LinRamp") do
@fact mse(render_output, @fact mse(render_output,
expected[(test_info.buf_size+1):(2*test_info.buf_size)]) => expected[(test_info.buf_size+1):(2*test_info.buf_size)]) =>
lessthan(MSE_THRESH) lessthan(MSE_THRESH)
@fact (@allocated render(ramp, dev_input, test_info)) => 256 @fact (@allocated render(ramp, dev_input, test_info)) => 64
end
facts("Offset") do
offs = TestNode(test_info.buf_size) + 0.5
render_output = render(offs, dev_input, test_info)
@fact render_output => 0.5 + AudioSample[1:test_info.buf_size]
@fact (@allocated render(offs, dev_input, test_info)) => 32
end end
end # module TestAudioIONodes end # module TestAudioIONodes