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

fixes issue and now passes test for stereo file playback (mixing to mono)

Browse source
This commit is contained in:
Spencer Russell 2014-08-13 12:31:56 -04:00
parent 5f074a4f87
commit 2620e6ecb2
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sndfile.jl
View file

@ -183,15 +183,17 @@ function render(node::FileRenderer, device_input::AudioBuf, info::DeviceInfo)
# Keep reading data from the file until the output buffer is full, but stop # Keep reading data from the file until the output buffer is full, but stop
# as soon as no more data can be read from the file # as soon as no more data can be read from the file
audio = Array(AudioSample, 0, node.file.sfinfo.channels) audio = Array(AudioSample, 0, node.file.sfinfo.channels)
read_audio = zeros(AudioSample, 1, node.file.sfinfo.channels) while true
while size(audio, 1) < info.buf_size && size(read_audio, 1) > 0
read_audio = read(node.file, info.buf_size-size(audio, 1), AudioSample) read_audio = read(node.file, info.buf_size-size(audio, 1), AudioSample)
audio = vcat(audio, read_audio) audio = vcat(audio, read_audio)
if size(audio, 1) >= info.buf_size || size(read_audio, 1) <= 0
break
end
end end
# if the file is stereo, mix the two channels together # if the file is stereo, mix the two channels together
if node.file.sfinfo.channels == 2 if node.file.sfinfo.channels == 2
return (audio[1, :] / 2) + (audio[2, :] / 2) return (audio[:, 1] / 2) + (audio[:, 2] / 2)
else else
return audio return audio
end end

5
test/test_sndfile.jl
View file

@ -72,10 +72,9 @@ facts("Stereo file rendering") do
AudioIO.open(fname) do f AudioIO.open(fname) do f
node = FilePlayer(f) node = FilePlayer(f)
buf = render(node, input, test_info) buf = render(node, input, test_info)
print(size(buf)) @fact buf[1:bufsize] => mse(expected[1:bufsize])
@fact expected[1:bufsize] => buf[1:bufsize]
buf = render(node, input, test_info) buf = render(node, input, test_info)
@fact expected[bufsize+1:2*bufsize] => buf[1:bufsize] @fact buf[1:bufsize] => mse(expected[bufsize+1:2*bufsize])
end end
end end