Commit graph

73 commits

Author SHA1 Message Date
James Liu
bdbbf75d82
Remove parking_lot dependency (#846)
The standard library is using a similar implementation to parking_lot now. Other than APIs that are unstable, there shouldn't be that much of a reason to rely on parking_lot anymore. Parts of the cpal codebase already are using std locks. This PR removes the remaining parking_lot uses and replaces them with the standard library's.
2024-02-25 01:48:53 +01:00
Przemysław Węgrzyn
6c3d11b8f6
ALSA: don't ignore POLLERR (#731) 2024-02-22 05:09:56 +01:00
Brandon Elam Barker
bbb58ab767
Clone for device (#830)
* Clone for Device and Alsa Device

* fix cloning around PCM

* add Clone for oboe Device

* add Clone for ASIO Device
2024-02-06 04:48:11 +01:00
Marc Bodmer
16617ceade update nix crate to v0.25 2022-10-20 16:03:47 +02:00
mbodmer
0a3e8c2208
add timeout paramter to DeviceTrait stream builders (#696)
* add timeout paramter to DeviceTrait stream builders

This makes it possible for the library client to handle situations where the host
takes too long to respond or even blocks forever, eg. a retry can be applied.

if the timeout passed is "None" the current behaviour is applied, eg. blocking forever.
if the timeout passed is a Duration then it will be applied to the Device Streams.
This is only implemented for ALSA, the other hosts will ignore the parameter for now.

Signed-off-by: Marc Bodmer <marc.bodmer@securiton.ch>
2022-10-18 18:15:31 +02:00
Kai Giebeler
85d773d59f Migrate Sample to dasp_sample (#689) 2022-10-07 14:08:54 +02:00
pin
0f8cd7a9c8 Add NetBSD support 2022-09-25 07:54:19 +02:00
Kai Giebeler
e78a847272 fix some clippy warnings 2022-09-20 21:51:20 +02:00
Luca Barbato
a540a98b0a Fallback to monotonic timestamp if monotonic_raw can be set up
Fixes #606
2022-03-22 21:24:41 +01:00
Dimitris Apostolou
1cd0caf8b6
Fix typos 2022-02-19 18:14:34 +02:00
Rémi Lauzier
8b99fce094
Rust 2021 and clap 3.0 2022-02-18 03:24:43 -05:00
nyanpasu64
1edf930bb4
Cleanup and document cpal's ALSA backend (#629) 2022-01-22 22:38:13 +01:00
est31
8e616c3dd9 Update alsa and nix dependencies
Also fixes the build.
2021-10-31 23:37:27 +01:00
Rémi Lauzier
ba462dad18
Fix some typo and warnings 2021-06-29 11:30:26 -04:00
Rémi Lauzier
6c78dce4c1
fix some clippy warnings 2021-06-25 18:07:05 -04:00
Alex Moon
c349eb1477 [ALSA] Improve stream setup parameters.
* Always set period before setting buffer size, even if
  `BufferSize::Fixed`.
* Set `start_threshold` based on `alsa::Direction` to avoid underruns on
  playback streams.

Also refactor the return values of the set params functions to reflect their
actual use and resolve some clippy warnings (including a logic error in
`stream_timestamp()`).
2021-06-17 17:09:26 +02:00
est31
5837ceb58f
Merge pull request #562 from JCapucho/fix-alsa-distortion
Fix alsa in some configs outputting bad audio
2021-03-29 11:38:20 +02:00
Marcel Märtens
a945d83ac7 give each thread a unique name 2021-03-22 11:06:15 +01:00
Marcel Märtens
f9720b9767 clippy fixes 2021-03-22 10:59:08 +01:00
João Capucho
52821d9c37
Fix alsa in some configs outputting bad audio
This was introduced in 6b91485 and could cause issues with some alsa
configurations like that of pipewire-alsa which caused the audio to be
become weirdly distorted
2021-03-19 22:04:32 +00:00
Alex Moon
9c4e240a7c Further refactoring of DeviceHandles.
Also fixes rustaudio/cpal#515.
2020-12-09 08:38:25 -07:00
Alex Moon
b89df31797 Refactor ALSA handle manipulation into methods on DeviceHandles. 2020-12-07 16:16:50 -07:00
Alex Moon
fb30d291ce Avoid calling alsa::PCM::new() multiple times.
Ensures that alsa::PCM::new() is called only once for a given Device so that we are
not rapidly opening and closing ALSA devices.
2020-11-18 10:22:41 -07:00
est31
a65e028412 Update alsa requirement to 0.4.3 and change io to io_bytes 2020-11-08 21:34:20 +01:00
Jacob Hughes
6b91485781 ALSA: Fix 100% CPU usage after underrun
With my previous patch, after an underrun occurred sometimes polling the
alsa FDs would always return POLLIN immediately, but avail_frames would
be zero. Eventually avail_frames would become nonzero and audio output
would work, but poll would still return immediately afterwards.

Calling `stream.prepare()` when this happens seems to fix the issue after
a few loops.
2020-09-01 12:31:06 -04:00
Jacob Hughes
119ada803e Handle ALSA overruns/underruns by resetting the PCM device 2020-08-31 14:20:24 -04:00
Richard Mitic
cb49e4446c Use alsa::pcm::Frames in alsa API calls instead of fixed-width integers.
`alsa::pcm::Frames` resolves to `c_long` which is 32 bits when compiling
for raspberry pi (armv7l).
2020-07-27 14:18:41 +02:00
Rob Watson
8a3dc611fa Fix compilation warnings 2020-07-14 22:05:55 +02:00
mitchmindtree
b78ff83c03
Merge pull request #401 from JoshuaBatty/buffersize_range
Prototyping an API for getting the supported min and max buffersizes
2020-07-14 14:35:46 +02:00
JoshuaBatty
e739dbf32d cargo fmt 2020-07-14 14:11:35 +02:00
JoshuaBatty
e854c4e54c added in sniperrifle2004 code from PR 431 2020-07-14 14:10:00 +02:00
JoshuaBatty
4ce12a69b9 adds docs for BufferSize and fixes buffersize bugs in emscripten and alsa 2020-07-14 13:19:26 +02:00
Konstantin Baltruschat
b177bcdf22
Fix build error when cross compiling to 32bit targets (#430) 2020-06-17 16:21:31 +02:00
JoshuaBatty
7c1adce330 adds support for buffersizes in webaudio and emscripten 2020-05-27 12:05:55 +02:00
JoshuaBatty
935fa280d3 buffersizes api for wasapi 2020-05-26 14:55:55 +02:00
JoshuaBatty
9e660da433 implemented buffersizes for asio 2020-05-26 14:55:55 +02:00
JoshuaBatty
d72b546dca gets buffersize range and allows to set buffersize for alsa 2020-05-26 14:55:55 +02:00
JoshuaBatty
7081c3bbd6 wip alsa buffersizes 2020-05-26 14:55:55 +02:00
mitchmindtree
cb95bfd88b alsa - Use status to retrieve avail, delay
This addresses @diwic's [tip][1] about using the pcm status to retrieve
avail and delay, as well as the timestamps, rather than using separate
pcm calls for each.

[1]: https://github.com/mitchmindtree/cpal/pull/5#issuecomment-621526946
2020-04-30 13:38:50 +02:00
mitchmindtree
163f0cc190 Move reference to timestamp validity bug to more suitable location 2020-04-28 17:43:40 +02:00
mitchmindtree
45977bf837 Add fallback instant source to ALSA backend
Here we use `std::time::Instant` as a fallback source for stream
instants in the case that the device produces invalid timestamps via
`get_htstamp`.
2020-04-28 17:40:40 +02:00
mitchmindtree
a49297ec2c WIP - Add ALSA timestamp implementation.
I think this is mostly complete, however there are two major TODOs:

- There seems to be a bug where timestamps are not reported when the
  target device is `pulse`. This causes a `panic!` as the trigger
  timestamp should always precede the timestamp when retrieved while the
  stream is running.
- We need to specify the timestamp type as MONOTONIC_RAW, however the
  `alsa` and `alsa-sys` crates do not yet expose the necessary
  `set_tstamp_type` function.
2020-04-28 17:38:44 +02:00
mitchmindtree
f032557fb4
Merge pull request #395 from mitchmindtree/callback_info
Add a `CallbackInfo` argument to the stream data callback
2020-04-27 14:32:37 +02:00
mitchmindtree
bcf962c447 Add a CallbackInfo argument to the stream data callback
I began on an implementation of the timestamp API described in #363 but
quickly realised that it might be best to land the API for providing
extra information to the user's callback first.

This PR adds two new types: `InputCallbackInfo` and `OutputCallbackInfo`.
These types are delivered to the user's data callback as a new, second
argument.

While these types are currently empty, the intention is for these types
to provide information relevant to the current request for or delivery
of data. This includes:

- Timestamp information #363.
- Flags related to the state of the stream (e.g buffer
  underflow/overflow).

In order to maintain flexibility to avoid breaking things, I figure we
can keep the fields of these types private and provide methods for
retrieving this info.

@Ralith, @ishitatsuyuki does this seem OK to you?
2020-04-16 14:50:36 +02:00
Richard Dodd
3c3349f926 Add some comments. 2020-04-15 18:46:54 +01:00
Richard Dodd
290f464330 Cargo fmt 2020-04-15 18:42:43 +01:00
Richard Dodd
86079e6439 Rebase off new alsa-rs impl 2020-04-15 18:41:40 +01:00
Alex Moon
b386e63eec Ignore play/pause errors for ALSA Stream 2020-04-12 13:11:35 -04:00
Alex Moon
62d540d396 Switch from vendored alsa-sys to alsa crate 2020-04-03 16:56:51 -04:00
mitchmindtree
476f6c4c2c Only allow for private construction of SupportedStreamConfig.
This should give the user a higher confidence that, if they have a
`SupportedStreamConfig` format type that it is actually supported.

Also updates the `raw` stream builder methods to take a `StreamConfig`
and `SampleFormat` as separate arguments for flexibility.

**Backends Updated**

- [x] null
- [x] alsa
- [ ] emscripten
- [ ] coreaudio
- [ ] wasapi
- [ ] asio
2020-02-02 18:43:30 +01:00