Commit graph

64 commits

Author SHA1 Message Date
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
mitchmindtree
9c781bd381 Rename stream Format types to Config
This implements the changes described at #370.

This commit implements only the `null` and `alsa` backends - the rest
will be implemented in follow-up commits.

Closes #370.
2020-01-27 21:28:07 +01:00
Benjamin Saunders
78df791377 Add _raw suffix to stream constructors 2020-01-21 21:52:18 -08:00
mitchmindtree
e7979d2dfe Fix some strangely formatted commented code 2020-01-21 00:15:52 +01:00
mitchmindtree
aab0d90add Remove old .rustfmt.toml config. Run default cargo fmt on repo.
Seeing as a few large refactors have landed recently, I thought I'd take
this opportunity to do a `cargo fmt` run and standardise on the default
rustfmt settings.
2020-01-20 20:35:23 +01:00
mitchmindtree
58356f49b4 An alternative approach to removing UnknownBufferType.
This is a potential alternative to #359. This PR is based on #359.

This approach opts for a dynamically checked sample type approach with
the aim of minimising compile time and binary size.

You can read more discussion on this [here](https://github.com/RustAudio/cpal/pull/359#issuecomment-575931461)

Implemented backends:

- [x] null
- [x] ALSA
- [ ] CoreAudio
- [ ] WASAPI
- [ ] ASIO
- [ ] Emscripten
2020-01-19 15:06:19 +01:00
mitchmindtree
05b62bb1c0 Remove UnknownTypeBuffer in favour of specifying sample type.
This is an implementation of the planned changes described in #119.

For a quick overview of how the API has changed, check out the updated
examples.

**TODO:**

- [x] Update API.
- [x] Update examples.
- [ ] Remove `data_type` field from `Format` (see [here](https://github.com/RustAudio/cpal/issues/119#issuecomment-573788380)).
- Update backends:
  - [x] null
  - [x] ALSA
  - [ ] ASIO
  - [ ] WASAPI
  - [ ] CoreAudio
  - [ ] Emscripten

Closes #119
Closes #260
2020-01-18 15:13:17 +01:00
mitchmindtree
2bf905f3ec
Merge pull request #358 from jbeich/dragonfly
DragonFly support
2020-01-13 15:47:45 +01:00
Jan Beich
3ac6f6a689 Enable ALSA on DragonFly
DragonFly like FreeBSD uses OSS under the hood but OSS backend isn't
available, so use ALSA.
2020-01-07 16:18:52 +00:00
Tatsuyuki Ishi
508e7d8ccf Add one missing error handling 2019-12-31 15:42:35 +01:00