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

renames bufsize to blocksize

Browse source
This commit is contained in:
Spencer Russell 2016-07-29 23:56:37 -04:00
parent 77dcb8965c
commit 30803bce97
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -8,7 +8,7 @@ PortAudio.jl is a wrapper for [libportaudio](http://www.portaudio.com/), which g
The easiest way to open a source or sink is with the default `PortAudioStream()` constructor, which will open a 2-in, 2-out stream to your system's default device(s). The constructor can also take the input and output channel counts as positional arguments, or a variety of other keyword arguments. The easiest way to open a source or sink is with the default `PortAudioStream()` constructor, which will open a 2-in, 2-out stream to your system's default device(s). The constructor can also take the input and output channel counts as positional arguments, or a variety of other keyword arguments.
```julia ```julia
PortAudioStream(inchans=2, outchans=2; eltype=Float32, samplerate=48000Hz, bufsize=4096) PortAudioStream(inchans=2, outchans=2; eltype=Float32, samplerate=48000Hz, blocksize=4096)
``` ```
You can open a specific device by adding it as the first argument, either as a `PortAudioDevice` instance or by name. You can also give separate names or devices if you want different input and output devices You can open a specific device by adding it as the first argument, either as a `PortAudioDevice` instance or by name. You can also give separate names or devices if you want different input and output devices

2
examples/audiometer.jl
View file

@ -3,7 +3,7 @@ using PortAudio
"""Continuously read from the default audio input and plot an """Continuously read from the default audio input and plot an
ASCII level/peak meter""" ASCII level/peak meter"""
function micmeter(metersize) function micmeter(metersize)
mic = PortAudioStream(1, 0; bufsize=512) mic = PortAudioStream(1, 0; blocksize=512)
signalmax = zero(eltype(mic)) signalmax = zero(eltype(mic))
println("Press Ctrl-C to quit") println("Press Ctrl-C to quit")

2
examples/spectrum.jl
View file

@ -6,7 +6,7 @@ module SpectrumExample
using GR, PortAudio, SampledSignals using GR, PortAudio, SampledSignals
const N = 1024 const N = 1024
const stream = PortAudioStream(1, 0, bufsize=N) const stream = PortAudioStream(1, 0, blocksize=N)
const buf = read(stream, N) const buf = read(stream, N)
const fmin = 0Hz const fmin = 0Hz
const fmax = 10000Hz const fmax = 10000Hz

27
src/PortAudio.jl
View file

@ -15,7 +15,7 @@ include("libportaudio.jl")
export PortAudioStream export PortAudioStream
# Size of the ringbuffer in frames. 85ms latency at 48kHz # Size of the ringbuffer in frames. 85ms latency at 48kHz
const DEFAULT_BUFSIZE=4096 const DEFAULT_blocksize=4096
# data is passed to and from the ringbuffer in chunks with this many frames # data is passed to and from the ringbuffer in chunks with this many frames
# it should be at most the ringbuffer size, and must evenly divide into the # it should be at most the ringbuffer size, and must evenly divide into the
# the underlying portaudio buffer size. E.g. if PortAudio is running with a # the underlying portaudio buffer size. E.g. if PortAudio is running with a
@ -85,7 +85,7 @@ end
# paramaterized on the sample type and sampling rate type # paramaterized on the sample type and sampling rate type
type PortAudioStream{T, U} type PortAudioStream{T, U}
samplerate::U samplerate::U
bufsize::Int blocksize::Int
stream::PaStream stream::PaStream
sink # untyped because of circular type definition sink # untyped because of circular type definition
source # untyped because of circular type definition source # untyped because of circular type definition
@ -94,24 +94,24 @@ type PortAudioStream{T, U}
# this inner constructor is generally called via the top-level outer # this inner constructor is generally called via the top-level outer
# constructor below # constructor below
function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice, function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice,
inchans, outchans, sr, bufsize) inchans, outchans, sr, blocksize)
inparams = (inchans == 0) ? inparams = (inchans == 0) ?
Ptr{Pa_StreamParameters}(0) : Ptr{Pa_StreamParameters}(0) :
Ref(Pa_StreamParameters(indev.idx, inchans, type_to_fmt[T], 0.0, C_NULL)) Ref(Pa_StreamParameters(indev.idx, inchans, type_to_fmt[T], 0.0, C_NULL))
outparams = (outchans == 0) ? outparams = (outchans == 0) ?
Ptr{Pa_StreamParameters}(0) : Ptr{Pa_StreamParameters}(0) :
Ref(Pa_StreamParameters(outdev.idx, outchans, type_to_fmt[T], 0.0, C_NULL)) Ref(Pa_StreamParameters(outdev.idx, outchans, type_to_fmt[T], 0.0, C_NULL))
this = new(sr, bufsize, C_NULL) this = new(sr, blocksize, C_NULL)
finalizer(this, close) finalizer(this, close)
this.sink = PortAudioSink{T, U}(outdev.name, this, outchans, bufsize) this.sink = PortAudioSink{T, U}(outdev.name, this, outchans, blocksize)
this.source = PortAudioSource{T, U}(indev.name, this, inchans, bufsize) this.source = PortAudioSource{T, U}(indev.name, this, inchans, blocksize)
if inchans > 0 && outchans > 0 if inchans > 0 && outchans > 0
# we've got a duplex stream. initialize with the output buffer full # we've got a duplex stream. initialize with the output buffer full
write(this.sink, SampleBuf(zeros(T, bufsize, outchans), sr)) write(this.sink, SampleBuf(zeros(T, blocksize, outchans), sr))
end end
this.bufinfo = CallbackInfo(inchans, this.source.ringbuf, this.bufinfo = CallbackInfo(inchans, this.source.ringbuf,
outchans, this.sink.ringbuf) outchans, this.sink.ringbuf)
this.stream = Pa_OpenStream(inparams, outparams, float(sr), bufsize, this.stream = Pa_OpenStream(inparams, outparams, float(sr), blocksize,
paNoFlag, pa_callbacks[T], fieldptr(this, :bufinfo)) paNoFlag, pa_callbacks[T], fieldptr(this, :bufinfo))
Pa_StartStream(this.stream) Pa_StartStream(this.stream)
@ -123,8 +123,8 @@ end
# this is the top-level outer constructor that all the other outer constructors # this is the top-level outer constructor that all the other outer constructors
# end up calling # end up calling
function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice, function PortAudioStream(indev::PortAudioDevice, outdev::PortAudioDevice,
inchans=2, outchans=2; eltype=Float32, samplerate=48000Hz, bufsize=DEFAULT_BUFSIZE) inchans=2, outchans=2; eltype=Float32, samplerate=48000Hz, blocksize=DEFAULT_blocksize)
PortAudioStream{eltype, typeof(samplerate)}(indev, outdev, inchans, outchans, samplerate, bufsize) PortAudioStream{eltype, typeof(samplerate)}(indev, outdev, inchans, outchans, samplerate, blocksize)
end end
function PortAudioStream(indevname::AbstractString, outdevname::AbstractString, args...; kwargs...) function PortAudioStream(indevname::AbstractString, outdevname::AbstractString, args...; kwargs...)
@ -186,7 +186,7 @@ Base.write(sink::PortAudioStream, source::PortAudioStream, args...) = write(sink
function Base.show(io::IO, stream::PortAudioStream) function Base.show(io::IO, stream::PortAudioStream)
println(io, typeof(stream)) println(io, typeof(stream))
println(io, " Samplerate: ", samplerate(stream)) println(io, " Samplerate: ", samplerate(stream))
print(io, " Buffer Size: ", stream.bufsize, " frames") print(io, " Buffer Size: ", stream.blocksize, " frames")
if nchannels(stream.sink) > 0 if nchannels(stream.sink) > 0
print(io, "\n ", nchannels(stream.sink), " channel sink: \"", stream.sink.name, "\"") print(io, "\n ", nchannels(stream.sink), " channel sink: \"", stream.sink.name, "\"")
end end
@ -205,11 +205,11 @@ for (TypeName, Super) in ((:PortAudioSink, :SampleSink),
ringbuf::LockFreeRingBuffer{T} ringbuf::LockFreeRingBuffer{T}
nchannels::Int nchannels::Int
function $TypeName(name, stream, channels, bufsize) function $TypeName(name, stream, channels, blocksize)
# portaudio data comes in interleaved, so we'll end up transposing # portaudio data comes in interleaved, so we'll end up transposing
# it back and forth to julia column-major # it back and forth to julia column-major
chunkbuf = zeros(T, channels, CHUNKSIZE) chunkbuf = zeros(T, channels, CHUNKSIZE)
ringbuf = LockFreeRingBuffer(T, bufsize * channels) ringbuf = LockFreeRingBuffer(T, blocksize * channels)
new(name, stream, chunkbuf, ringbuf, channels) new(name, stream, chunkbuf, ringbuf, channels)
end end
end end
@ -217,6 +217,7 @@ end
SampledSignals.nchannels(s::Union{PortAudioSink, PortAudioSource}) = s.nchannels SampledSignals.nchannels(s::Union{PortAudioSink, PortAudioSource}) = s.nchannels
SampledSignals.samplerate(s::Union{PortAudioSink, PortAudioSource}) = samplerate(s.stream) SampledSignals.samplerate(s::Union{PortAudioSink, PortAudioSource}) = samplerate(s.stream)
SampledSignals.blocksize(s::Union{PortAudioSink, PortAudioSource}) = s.stream.blocksize
Base.eltype{T, U}(::Union{PortAudioSink{T, U}, PortAudioSource{T, U}}) = T Base.eltype{T, U}(::Union{PortAudioSink{T, U}, PortAudioSource{T, U}}) = T
Base.close(s::Union{PortAudioSink, PortAudioSource}) = close(s.ringbuf) Base.close(s::Union{PortAudioSink, PortAudioSource}) = close(s.ringbuf)