From patchwork Thu Jan 14 13:46:00 2016 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: 567464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8B30914031E for ; Fri, 15 Jan 2016 01:03:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=O9/O8FSf; dkim-atps=neutral Received: from localhost ([::1]:42677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiUx-0003VP-EH for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 09:03:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEi-0001tL-Hx for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEh-0003bG-LY for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:48 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEh-0003b5-Go for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:47 -0500 Received: by mail-wm0-x242.google.com with SMTP id f206so43696409wmf.2 for ; Thu, 14 Jan 2016 05:46:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Azi5FW0fLZpzgPnKw9T0qc7BG2pZu/N0z1K/aSBvTBg=; b=O9/O8FSf1WC68/kG7OcmaoEoSU3S4ypggq2Hec0QRlp3l9Ph8iNg8noVwp1t0nP+4E 5mI//zVND6OI0aba8kTNp4pWbkxToEmInhcluvThflpdftlzMwHbfm4/lm1MmYWOTyCD xfKstJ2x4H6A51dglTxD28fZhq83HqOZi2yOPz9+K0F7yjJqTvZ3OTAcChQ4xj98SWgS t2DoP9wvqXuJEEevWGjaSiF/SKhwsDdidUzEKR0uT2kTzbOo7rxdS7HbZscQoxeB5qMH Eljz6TYF26jF9l75gWfblauQm27LXsd1aBrfrqNGAHMMjm/zNi6PtD9dx+rfwfrbl0+J 8Zmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=Azi5FW0fLZpzgPnKw9T0qc7BG2pZu/N0z1K/aSBvTBg=; b=kBJYzZUgG7/OIBQYTRQvJd2COlIfS3v61M2x4WTV1rmyYTDqQNX1PfzkK7JUETQH+B +mpoi42d/cG2fr+M7ypWqRY5itNkj9QsIAo192iFNMlRnYTMe2lP54zSinT13tQglpzG DRJMRBgCgghOdRyDG1+3asXNv86Xev+Lj5/ZOAwXSJ6vieSIoe2Apysc6lafD9IId8CY yUGCWPG2vahB26GzYPcNK4lzC9pFXF/awnbisBVzHO4yhpc+RO+Ncc8F3gEv48GURniN kRE02jDv5PkVCS+Aw4kCdzqQrHWqCPYX9rtTE3SumHCJBwHq4FPiloD7EMgoZgRNxgQy iGBA== X-Gm-Message-State: ALoCoQnMd8bCHzTU1M0gJ5S7Z0BSQucnx1wuwPRXYluTfwdRhpVdfbYMqoXMDZmvm22iyr2bPW2LWLz3570/bliGyTsVmNk2FQ== X-Received: by 10.194.83.72 with SMTP id o8mr4307823wjy.46.1452779206993; Thu, 14 Jan 2016 05:46:46 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:46 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2016 14:46:00 +0100 Message-Id: <61ce56440b7bed5a7213181f770c7690f7fdb984.1452776884.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 47/51] audio: basic support for multichannel audio X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 5c66f79..b3cbe6b 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -499,13 +499,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 (pdo->buffer_count) { if (pdo->buffer_len) { int64_t req = pdo->buffer_len * pdo->buffer_count; diff --git a/audio/audio.c b/audio/audio.c index 1c9bd63..f276dc9 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -210,7 +210,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) {