qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kővágó@redhat.com, Zoltán <DirtY.iCE.hu@gmail.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 09/13] audio: basic support for multichannel audio
Date: Fri, 18 Oct 2019 09:41:40 +0200	[thread overview]
Message-ID: <20191018074144.24071-10-kraxel@redhat.com> (raw)
In-Reply-To: <20191018074144.24071-1-kraxel@redhat.com>

From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>

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 <DirtY.iCE.hu@gmail.com>
Message-id: 7e53be1f97e939ed3bb729ef39e76b775643118a.1570996490.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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



  parent reply	other threads:[~2019-10-18  7:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18  7:41 [PULL 00/13] Audio 20191018 patches Gerd Hoffmann
2019-10-18  7:41 ` [PULL 01/13] audio: fix parameter dereference before NULL check Gerd Hoffmann
2019-10-18  7:41 ` [PULL 02/13] audio: paaudio: fix connection and stream name Gerd Hoffmann
2019-10-18  7:41 ` [PULL 03/13] audio: paaudio: ability to specify " Gerd Hoffmann
2019-10-18  7:41 ` [PULL 04/13] audio: add mixing-engine option (documentation) Gerd Hoffmann
2019-10-18  7:41 ` [PULL 05/13] audio: make mixeng optional Gerd Hoffmann
2019-10-18  7:41 ` [PULL 06/13] paaudio: get/put_buffer functions Gerd Hoffmann
2019-10-18  7:41 ` [PULL 07/13] audio: support more than two channels in volume setting Gerd Hoffmann
2019-10-18  7:41 ` [PULL 08/13] audio: replace shift in audio_pcm_info with bytes_per_frame Gerd Hoffmann
2019-10-18  7:41 ` Gerd Hoffmann [this message]
2019-10-18  7:41 ` [PULL 10/13] usb-audio: do not count on avail bytes actually available Gerd Hoffmann
2019-10-18  7:41 ` [PULL 11/13] usb-audio: support more than two channels of audio Gerd Hoffmann
2019-10-18  7:41 ` [PULL 12/13] usbaudio: change playback counters to 64 bit Gerd Hoffmann
2019-10-18  7:41 ` [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams Gerd Hoffmann
2019-10-18 15:36 ` [PULL 00/13] Audio 20191018 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191018074144.24071-10-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=DirtY.iCE.hu@gmail.com \
    --cc=Kővágó@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).