[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/13] audio: basic support for multichannel audio
From: |
Gerd Hoffmann |
Subject: |
[PULL 09/13] audio: basic support for multichannel audio |
Date: |
Fri, 18 Oct 2019 09:41:40 +0200 |
From: Kővágó, Zoltán <address@hidden>
Which currently only means removing some checks. Old code won't require
more than two channels, but new code will need it.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/alsaaudio.c | 7 -------
audio/audio.c | 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index eddf013a537c..f37ce1ce8570 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -493,13 +493,6 @@ static int alsa_open(bool in, struct alsa_params_req *req,
goto err;
}
- if (nchannels != 1 && nchannels != 2) {
- alsa_logerr2 (err, typ,
- "Can not handle obtained number of channels %d\n",
- nchannels);
- goto err;
- }
-
if (apdo->buffer_length) {
int dir = 0;
unsigned int btime = apdo->buffer_length;
diff --git a/audio/audio.c b/audio/audio.c
index c00f4deddd3d..7fc3aa9d1637 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -242,7 +242,7 @@ static int audio_validate_settings (struct audsettings *as)
{
int invalid;
- invalid = as->nchannels != 1 && as->nchannels != 2;
+ invalid = as->nchannels < 1;
invalid |= as->endianness != 0 && as->endianness != 1;
switch (as->fmt) {
--
2.18.1
- [PULL 00/13] Audio 20191018 patches, Gerd Hoffmann, 2019/10/18
- [PULL 01/13] audio: fix parameter dereference before NULL check, Gerd Hoffmann, 2019/10/18
- [PULL 03/13] audio: paaudio: ability to specify stream name, Gerd Hoffmann, 2019/10/18
- [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams, Gerd Hoffmann, 2019/10/18
- [PULL 07/13] audio: support more than two channels in volume setting, Gerd Hoffmann, 2019/10/18
- [PULL 12/13] usbaudio: change playback counters to 64 bit, Gerd Hoffmann, 2019/10/18
- [PULL 09/13] audio: basic support for multichannel audio,
Gerd Hoffmann <=
- [PULL 08/13] audio: replace shift in audio_pcm_info with bytes_per_frame, Gerd Hoffmann, 2019/10/18
- [PULL 10/13] usb-audio: do not count on avail bytes actually available, Gerd Hoffmann, 2019/10/18
- [PULL 04/13] audio: add mixing-engine option (documentation), Gerd Hoffmann, 2019/10/18
- [PULL 05/13] audio: make mixeng optional, Gerd Hoffmann, 2019/10/18
- [PULL 11/13] usb-audio: support more than two channels of audio, Gerd Hoffmann, 2019/10/18
- [PULL 06/13] paaudio: get/put_buffer functions, Gerd Hoffmann, 2019/10/18
- [PULL 02/13] audio: paaudio: fix connection and stream name, Gerd Hoffmann, 2019/10/18
- Re: [PULL 00/13] Audio 20191018 patches, Peter Maydell, 2019/10/18