From patchwork Sun Sep 8 21:22:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1159553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pJGtId1N"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46RPxz5v5dz9sCJ for ; Mon, 9 Sep 2019 07:46:31 +1000 (AEST) Received: from localhost ([::1]:50866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i750v-0000bK-PD for incoming@patchwork.ozlabs.org; Sun, 08 Sep 2019 17:46:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46471) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i74e3-0005cK-Ak for qemu-devel@nongnu.org; Sun, 08 Sep 2019 17:22:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i74e2-0005vH-7y for qemu-devel@nongnu.org; Sun, 08 Sep 2019 17:22:51 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:44769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i74e1-0005v0-Va for qemu-devel@nongnu.org; Sun, 08 Sep 2019 17:22:50 -0400 Received: by mail-qt1-x841.google.com with SMTP id u40so13809653qth.11 for ; Sun, 08 Sep 2019 14:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CtjKKyn1WE+uGIJpF5emUL6aD8nQttfLcRsN/KEPtcI=; b=pJGtId1NkDb0qe0VwYjNaydQ3M4uiSm+V0F40+XACKaR+Gi8HDz0T5kDqJuwRASOdn 4+XCSb+HdmThFeZ5TXWr10tPBeYC5/u0c4Jl83bBvz8vg+fOQNWN8JJ1p/K4Tw1SyQfR b/bNUIdAI6SkRNX6iKJ4IkE4I76ztliZx40jkDamOnEZXLQ5CHzGy3/i05VKiJmiXvs3 /K1+eWXGLX72YwOq4fmOCjsGrve95H0TORfscK4GJFG/fHGeeBB2DphappgtronzgKB1 VYkkYgeungAnG92XxDmh5gUw7nVWxhYywWWDrTghfi6zTfb+fZud2YuzB7rKB6x0EHLr 7ENA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CtjKKyn1WE+uGIJpF5emUL6aD8nQttfLcRsN/KEPtcI=; b=Es9RJzrpExldKd639S81JPxh5lgsZ/ay5NgSJ89/HGOR5F6LCBzCkKIQheZCMfFIqv SsF5I1UoYoSH/CjyGTmXE9gKuvxY6boIANMOYv1oBeFXUih6bKGy3NtKujB2KSkNbr6O /HYLscrlHa/CrSYK96sEh3ASCO2oEGxRBmHpv1J6gCKg5P9DlNr+qYYcAzd9RTkEmfD5 codGXHfWPnepD3Xv+hxa1LF4bi9slY8VB/6nqWYABf8zUp9Pc5DjasyTdWp/PA1AX4/c ugPvmGEuNAW/GV6Nlp5NNENROyTE4om3i3AzczaPhvTylYrI10l9RuEoJQUgrWZz/jyC /7Bg== X-Gm-Message-State: APjAAAWfIJQX1ECopnTYGwXmtHRzTRx1oR6KfwqngenUn9DZTLW6Gwwa tuwKyd+5cNiWNXvM35YuvR+m5ZcP X-Google-Smtp-Source: APXvYqw/eKdN3mWh9ITnjmE6SbjG/p+5madrT1PnHi7eaXRU/P4YXgwSwJDZXtLSxDktAAFf9kDF5w== X-Received: by 2002:ac8:1102:: with SMTP id c2mr20936817qtj.340.1567977769504; Sun, 08 Sep 2019 14:22:49 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-6ea8-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:6ea8::5]) by smtp.gmail.com with ESMTPSA id e2sm5488112qkg.38.2019.09.08.14.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2019 14:22:49 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Sun, 8 Sep 2019 23:22:20 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v2 20/24] audio: basic support for multichannel audio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 eddf013a53..f37ce1ce85 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 7821365a85..6a5979f262 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) {