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

Make audio file reads return data as n_frames x n_channels

Browse source
This commit is contained in:
Joris Kraak 2014-08-01 17:56:01 +02:00
parent b79b47a461
commit 26cf69ad94
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sndfile.jl
View file

@ -105,7 +105,7 @@ end
# through an arbitrary render chain and returns the result as a vector # through an arbitrary render chain and returns the result as a vector
function Base.read(file::AudioFile, nframes::Integer, dtype::Type) function Base.read(file::AudioFile, nframes::Integer, dtype::Type)
@assert file.sfinfo.channels <= 2 @assert file.sfinfo.channels <= 2
arr = zeros(dtype, file.sfinfo.channels, nframes) arr = zeros(dtype, nframes, file.sfinfo.channels)
if dtype == Int16 if dtype == Int16
nread = ccall((:sf_readf_short, libsndfile), Int64, nread = ccall((:sf_readf_short, libsndfile), Int64,
@ -125,7 +125,7 @@ function Base.read(file::AudioFile, nframes::Integer, dtype::Type)
file.filePtr, arr, nframes) file.filePtr, arr, nframes)
end end
return arr[:, 1:nread] return arr[1:nread, :]
end end
Base.read(file::AudioFile, dtype::Type) = Base.read(file, file.sfinfo.frames, dtype) Base.read(file::AudioFile, dtype::Type) = Base.read(file, file.sfinfo.frames, dtype)
@ -174,11 +174,11 @@ 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, node.file.sfinfo.channels, 0) audio = Array(AudioSample, 0, node.file.sfinfo.channels)
read_audio = zeros(AudioSample, node.file.sfinfo.channels, 1) read_audio = zeros(AudioSample, 1, node.file.sfinfo.channels)
while size(audio, 2) < info.buf_size && size(read_audio, 2) > 0 while size(audio, 1) < info.buf_size && size(read_audio, 1) > 0
read_audio = read(node.file, info.buf_size-size(audio, 2), AudioSample) read_audio = read(node.file, info.buf_size-size(audio, 1), AudioSample)
audio = hcat(audio, read_audio) audio = vcat(audio, read_audio)
end end
# if the file is stereo, mix the two channels together # if the file is stereo, mix the two channels together