From patchwork Fri Jan 11 05:15:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: laxmi.devi@in.bosch.com X-Patchwork-Id: 10757383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1961113B5 for ; Fri, 11 Jan 2019 05:16:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01FED299CF for ; Fri, 11 Jan 2019 05:16:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9104299DD; Fri, 11 Jan 2019 05:16:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51DC4299CF for ; Fri, 11 Jan 2019 05:16:16 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 390052678FD; Fri, 11 Jan 2019 06:16:14 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A57EA2678FD; Fri, 11 Jan 2019 06:16:11 +0100 (CET) Received: from de-out1.bosch-org.com (de-out1.bosch-org.com [139.15.230.186]) by alsa0.perex.cz (Postfix) with ESMTP id B54022677D0; Fri, 11 Jan 2019 06:16:08 +0100 (CET) Received: from si0vm1947.rbesz01.com (unknown [139.15.230.188]) by si0vms0217.rbdmz01.com (Postfix) with ESMTPS id 43bWKz6F6cz4f3kZ7; Fri, 11 Jan 2019 06:16:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=in.bosch.com; s=2015-01-21; t=1547183767; bh=CX+w/nR4SJzzOPvDPU0/ML5HvbqrquVrfOefvgXdqvw=; l=10; h=From:From:Reply-To:Sender; b=nsvQA1CUMm41t8q6fiHYO7qLP9a0UrQ5iH2/1E6OBLReiZaEmzt+6IEUMZO27/9p3 Xex7F0Fy/zkrkZ7z/Ps1VGlmzZVVdo/D4E1PtyXLNsKAqzcl5qvpr96gh9odgyZIrp O++xW8DXN3ZBeiGTcz5jhDeXXoPsxzPGZ5jDBbs4= Received: from fe0vm7918.rbesz01.com (unknown [10.58.172.176]) by si0vm1947.rbesz01.com (Postfix) with ESMTPS id 43bWKz5wYqz6CjQ32; Fri, 11 Jan 2019 06:16:07 +0100 (CET) X-AuditID: 0a3aad10-363ff70000003834-30-5c382697e62d Received: from fe0vm1651.rbesz01.com ( [10.58.173.29]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by fe0vm7918.rbesz01.com (SMG Outbound) with SMTP id 1F.83.14388.796283C5; Fri, 11 Jan 2019 06:16:07 +0100 (CET) Received: from SI-HUB2000.de.bosch.com (si-hub2000.de.bosch.com [10.4.103.108]) by fe0vm1651.rbesz01.com (Postfix) with ESMTPS id 43bWKz4HtRz1p6; Fri, 11 Jan 2019 06:16:07 +0100 (CET) Received: from localhost.localdomain (10.47.103.107) by SI-HUB2000.de.bosch.com (10.4.103.108) with Microsoft SMTP Server id 15.1.1591.10; Fri, 11 Jan 2019 06:16:06 +0100 From: To: Date: Fri, 11 Jan 2019 10:45:54 +0530 Message-ID: <1547183755-3551-1-git-send-email-laxmi.devi@in.bosch.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.47.103.107] X-Brightmail-Tracker: H4sIAAAAAAAAA22Sb0wTdxzG+7try1k5di1Uv3RA5ym6NYKFQbj5DzaXga80Mb7BRj3kaJvR Qu4KAV4h2qggQYyohYUsiHOoKCUVJY2CDWoKzmGD/xIjY3EJEbOJBUGn4tUD2xe+e+55vp97 ck+OwDUNUTrCandwvJ0tppUquWptZ2LKiZWMyfguYGBG7vowpvNMtYJpO+7CcvC8rmCNMq/5 wLmorVi+an0hV2wt5/g1G3erLI1/BpWl5+IqJi/cx6pRD1WLFhFAZcDAf314LVIRGuoEBnOv vVHSgxfB3HvPfHIBwdjoRSyEKCk91F1rl9cigoijEqAhQIZsnCqE/v9blCEdS5mgZXj0o5ZT ydDV51GENEn9BP/UDUdJzUnw6M4hXPLV4Hc9lUvvAbg+Po5LN8vg9p0X2BEU0xxx1hxx9ivC ziJtEWcst2V9l8ak8gWcUGVMS91TYutG0lrUFdQ7WORDFIHoaPIPBWPSKNhyodLmQ5kERmvJ LYtFK6agpLDSwgqWXXxZMSfQOhLJZDJN7CdbKCuwWQXBWmL3ISBwOo6s14ocWchWVnF8iYT5 0JeEnF5Kpm227tBQZtbB/cxxpRy/kK4jCBrIzctFUM1zZq6iyFrsWIjpRKlzSWQSWYsRi3zo WyJa7F69ItQtlLI2wWqex+MlXLPghtFBlKVbSm5IFhkqlFrK7J9adQnkm5ksk0YbEYTJZ+gR EneLJRtDhdHijxjuA9LZPrZDo543w1D6aZGhulRwwOPE4e3UZRzcv+1TwMOBXxQw1TmkguHW 9sUwvv9sDMxWT1DQ7J6hwN/aqIbpg91q6Bt6qobfr/csAb/naDycnPYmwcXJia+gx9NEi8QZ Gm7fe7kCHgcbV4qq2wDB+psGGBkcEtXVgAHcA4NGmOm9mQFPZp9nwGF/XyYEOy4xEDjdsQ6m ArMbYPZ5bfYzcUxMHHPbq6zQmA7W8Zkx593w1+mq0Y+uPbmZ+rfZef2bWl3J8GLvsejVw4wi /4H2QdWpSwn9k1ucKQ78lt7v5ozuv5LtJhtbtOYh3lFhzcn1XpOZ5bt7ZY6GiZofeutu/Ms/ WXX+i11tNam5zpyv9UnlmdvN9c7L+OjY99lrv3Gm5O/cqL91cqrHNS7/2zuSPqJmmrbTcsHC phlwXmA/AAiy0YMiBAAA Cc: twischer@de.adit-jv.com, alsa-devel@alsa-project.org, Laxmi Devi Subject: [alsa-devel] [PATCH - ALSA JACK plugin 1/2] jack: Replacing jack->channels with jack->num_ports X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laxmi Devi As jack->num_ports and jack->channels hold the same values, jack->channels is redundant and hence removed. Sanity check is added in prepare, to check if io->Channels is same as jack->num_ports. Signed-off-by: Laxmi Devi diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index af2136e..d723b17 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -48,7 +48,6 @@ typedef struct { unsigned int sample_bits; snd_pcm_uframes_t min_avail; - unsigned int channels; snd_pcm_channel_area_t *areas; jack_port_t **ports; @@ -263,6 +262,12 @@ static int snd_pcm_jack_prepare(snd_pcm_ioplug_t *io) snd_pcm_sw_params_t *swparams; int err; + if (io->channels != jack->num_ports) { + SNDERR("Channel count %d not equal to no. of ports %d in JACK", + io->channels, jack->num_ports); + return -EINVAL; + } + jack->hw_ptr = 0; jack->xrun_detected = false; @@ -381,7 +386,7 @@ static int jack_set_hw_constraint(snd_pcm_jack_t *jack) unsigned int psize_list[MAX_PERIODS_MULTIPLE]; unsigned int nframes = jack_get_buffer_size(jack->client); unsigned int jack_buffer_bytes = (snd_pcm_format_size(format, nframes) * - jack->channels); + jack->num_ports); unsigned int i; int err; @@ -398,7 +403,7 @@ static int jack_set_hw_constraint(snd_pcm_jack_t *jack) (err = snd_pcm_ioplug_set_param_list(&jack->io, SND_PCM_IOPLUG_HW_FORMAT, 1, &format)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&jack->io, SND_PCM_IOPLUG_HW_CHANNELS, - jack->channels, jack->channels)) < 0 || + jack->num_ports, jack->num_ports)) < 0 || (err = snd_pcm_ioplug_set_param_minmax(&jack->io, SND_PCM_IOPLUG_HW_RATE, rate, rate)) < 0 || (err = snd_pcm_ioplug_set_param_list(&jack->io, SND_PCM_IOPLUG_HW_PERIOD_BYTES, @@ -485,8 +490,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, return err; } - jack->channels = jack->num_ports; - if (jack->channels == 0) { + if (jack->num_ports == 0) { SNDERR("define the %s_ports section", stream == SND_PCM_STREAM_PLAYBACK ? "playback" : "capture"); snd_pcm_jack_free(jack); @@ -514,7 +518,7 @@ static int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name, return -ENOENT; } - jack->areas = calloc(jack->channels, sizeof(snd_pcm_channel_area_t)); + jack->areas = calloc(jack->num_ports, sizeof(snd_pcm_channel_area_t)); if (! jack->areas) { snd_pcm_jack_free(jack); return -ENOMEM; From patchwork Fri Jan 11 05:15:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: laxmi.devi@in.bosch.com X-Patchwork-Id: 10757385 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7D9913B5 for ; Fri, 11 Jan 2019 05:16:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B89BA299CF for ; Fri, 11 Jan 2019 05:16:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC793299DD; Fri, 11 Jan 2019 05:16:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1727A299CF for ; Fri, 11 Jan 2019 05:16:22 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A3B76267902; Fri, 11 Jan 2019 06:16:17 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id B53E0267903; Fri, 11 Jan 2019 06:16:14 +0100 (CET) Received: from de-out1.bosch-org.com (de-out1.bosch-org.com [139.15.230.186]) by alsa0.perex.cz (Postfix) with ESMTP id 249312677D8; Fri, 11 Jan 2019 06:16:11 +0100 (CET) Received: from si0vm1947.rbesz01.com (unknown [139.15.230.188]) by si0vms0216.rbdmz01.com (Postfix) with ESMTPS id 43bWL353nYz1XLG2r; Fri, 11 Jan 2019 06:16:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=in.bosch.com; s=2015-01-21; t=1547183771; bh=CX+w/nR4SJzzOPvDPU0/ML5HvbqrquVrfOefvgXdqvw=; l=10; h=From:From:Reply-To:Sender; b=h0VOQewemTwyns245iD6MEf5AMKjVr62/9ht5DPBlheFuSyAbnDBS83N3Pew9Exx5 bBi5beIbi3o+cxlkfUFhiKL2mcTGuqlkSTaBEh3dV3sI81UmjS5i5Q3jU90d1QO2i0 ZPM+y3LW5A17j6jw2U6Hv3B4CT04vQN/jxJnJZfc= Received: from si0vm4642.rbesz01.com (unknown [10.58.172.176]) by si0vm1947.rbesz01.com (Postfix) with ESMTPS id 43bWL34bD6z6CjQ32; Fri, 11 Jan 2019 06:16:11 +0100 (CET) X-AuditID: 0a3aad12-c1dff70000000275-07-5c38269b45c7 Received: from si0vm1950.rbesz01.com ( [10.58.173.29]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by si0vm4642.rbesz01.com (SMG Outbound) with SMTP id 4C.57.00629.B96283C5; Fri, 11 Jan 2019 06:16:11 +0100 (CET) Received: from SI-HUB2000.de.bosch.com (si-hub2000.de.bosch.com [10.4.103.108]) by si0vm1950.rbesz01.com (Postfix) with ESMTPS id 43bWL33FPSz2Zl; Fri, 11 Jan 2019 06:16:11 +0100 (CET) Received: from localhost.localdomain (10.47.103.107) by SI-HUB2000.de.bosch.com (10.4.103.108) with Microsoft SMTP Server id 15.1.1591.10; Fri, 11 Jan 2019 06:16:10 +0100 From: To: Date: Fri, 11 Jan 2019 10:45:55 +0530 Message-ID: <1547183755-3551-2-git-send-email-laxmi.devi@in.bosch.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547183755-3551-1-git-send-email-laxmi.devi@in.bosch.com> References: <1547183755-3551-1-git-send-email-laxmi.devi@in.bosch.com> MIME-Version: 1.0 X-Originating-IP: [10.47.103.107] X-Brightmail-Tracker: H4sIAAAAAAAAA22Sb0wbdRzG+d613VE5cxx0fK1sdnWom7N2iHKZ0xizTBYVNfhGQfFYb/Qy WvCukLEYUxcYo537n0HLnIqgMlZZzRZqFufofME2wYAThyBubhqEZUAgoCtG73aw9oVvLvd7 nufze3JPjiLZ8BIzJbo9guTmy6wGo864LrTskaYHuCL7meYV3KW+KMGFPvPquebDAeIZMu/E 9A5DXrCufcnLxOvG9Q6hTKwSpEeffsvoHD6/Q1cRJrftnm0zeOEa4YNkCpkcfK+rX+8DI8Uy DQTu6jmwcDgN2BCIgnb4AtA/ccigIgbmPvSfadH5gKLSmUzc20+rMsk48Gys6XYkjXkTA6du 6NWIjsnCkbG3VZlmNuLIgSnQipfjYG89qb4nM8/h1J7W2yirZM6F+3VaPhXPB67rtOsRu0ZH SY1dgd/1ThL7gAkmxIIJsY+AOAYmWbRXuXKeyMm2SSWCvN2+1ra53PUlaCOyEQgPbIkCQ4E1 hb6o54pYPV8lV7ui8DhFWE30S3cp0t0l5Y5qJy87i6XKMkG2mmlISkpi0+7IcmWJS5Rlsdwd BaRIazr9vknhaAdfvV2QyjUsCvdSOmsGPXPQVcgypbxH2CoIFYK06D5JUVakN92vgKmSUCps 2yKWeRZt6zKtc2mik1hLUMlReIxKUbrXrFS75QreJYulC/g9Gs4uqnH0AuSaM+inshSGUV1n pftOqzmTvjWXW8SaEow4OQbXQdktjd6vFqYo/2e8D+nalquFbOqCGIeyTygMMw5Yd7KWxPmZ ThKD4TkGhyeH0nH4+x+XY/fxgxbsmBq34DehFg531x96Hn9t/fRF/HM+WID7alqKsfETP4+D kbYS/PloZDMOjU+IOBr7wIWdNRNubJz8TcKRv457MODdVa0QV2oAezt9DYC+nromwPCtjjbA 6b6bIVDZPsCZLv8PoNDTA4CXBnyDgCONsavq8/I1GFN2JZRdC2Zz1V09vOd/dl1Q4x9q9oKt uX1w6d/nYllbV3bn559+yPnThGnmleQHN75q3xD6vCOSFHnDG6uc//Zw48OXue7agdkj/3D5 thsWMuOKzfHLO+1H9kpfeXLWX9j57h9GUVd4c01P8wsb8r6G7MydlrOWuVP9zxY79vy+Sm/7 ePW614YKPvz36Kaeeu5Y6yq/3XKy5mK7VSc7+bWrSUnm/wNnojEQRAQAAA== Cc: twischer@de.adit-jv.com, alsa-devel@alsa-project.org, Laxmi Devi Subject: [alsa-devel] [PATCH - ALSA JACK plugin 2/2] jack: Removing snd_pcm_jack_format_t as it is not used X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Laxmi Devi Signed-off-by: Laxmi Devi diff --git a/jack/pcm_jack.c b/jack/pcm_jack.c index d723b17..b2bc213 100644 --- a/jack/pcm_jack.c +++ b/jack/pcm_jack.c @@ -31,10 +31,6 @@ #define MAX_PERIODS_MULTIPLE 64 -typedef enum _jack_format { - SND_PCM_JACK_FORMAT_RAW -} snd_pcm_jack_format_t; - typedef struct { snd_pcm_ioplug_t io;