diff options
| author | Jean-Yves Avenard <[email protected]> | 2018-03-19 14:57:07 +0100 |
|---|---|---|
| committer | Paul Adenot <[email protected]> | 2018-03-19 14:57:07 +0100 |
| commit | 789eaaa3b0d77b55e110353972d6713889f510ea (patch) | |
| tree | fbeb48958ab83c329193f37c54133c9bc68aac4a /src/cubeb_audiotrack.c | |
| parent | c88a484e1aac878419946334c49d35d6948beec7 (diff) | |
| download | cubeb-789eaaa3b0d77b55e110353972d6713889f510ea.tar.gz cubeb-789eaaa3b0d77b55e110353972d6713889f510ea.zip | |
Multi-channels support for windows/mac/linux (#426)
* Add QUAD and QUAD_LFE layouts.
* Remove dual mono layout.
It makes no sense to have a case for those as the data structure
used (a bitmask) do not allow to represent this channel layout (a
channel can only be present once). As such it was a non-functional
layout
* Fix up cubeb_pulse compilation using C++ keyword.
* Remove the concept of preferred layout.
Channel layout is derived by the content being played. The concept of
preferred layout is meaningless. Either we have a layout defined, or
we don't. There's no in-between.
So we remove it.
* Remove CHANNEL_MONO concept.
* Add cubeb_sample_size convenience method.
* Rework cubeb_mixer.
This completely replace the existing remixer which had serious limitations:
1- Had no memory bound checks
2- Could only downmix 5.1 and 7.1 to stereo.
This mixer allows to convert from any sane layout to any other and work directly on interleaved samples.
This cubeb_mixer doesn't have an API compatible with the previous one.
This commit is non-fonctional, and was split for ease of review.
* Fix remixing on mac, windows and pulse backend.
* Make cubeb_mixer creation infallible.
Rather than ignore nonsensical layouts, we attempt to play it according to the stream channels count instead. The audio data will be played as-is, dropping the extra channels or inserting silence where needed.
* User proper sample size when calculating offsets.
Should the user data be of a different type to what the AudioUnit output is set to, we would have written outside the end of our allocated buffer.
* Fix input mixing and clarify frames vs samples terminology
* If a layout is unknown or invalid, always treat it as plain stereo or mono.
Diffstat (limited to 'src/cubeb_audiotrack.c')
| -rw-r--r-- | src/cubeb_audiotrack.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cubeb_audiotrack.c b/src/cubeb_audiotrack.c index 98d0bd9..0f4dfbb 100644 --- a/src/cubeb_audiotrack.c +++ b/src/cubeb_audiotrack.c @@ -423,7 +423,6 @@ static struct cubeb_ops const audiotrack_ops = { .get_max_channel_count = audiotrack_get_max_channel_count, .get_min_latency = audiotrack_get_min_latency, .get_preferred_sample_rate = audiotrack_get_preferred_sample_rate, - .get_preferred_channel_layout = NULL, .enumerate_devices = NULL, .device_collection_destroy = NULL, .destroy = audiotrack_destroy, |