From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=3.0 tests=AWL,BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 1127A1F5B1 for ; Fri, 31 Jul 2020 09:39:04 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1k1RVG-0006cP-0O; Fri, 31 Jul 2020 09:39:02 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1RVF-0006c9-Ch for sox-devel@lists.sourceforge.net; Fri, 31 Jul 2020 09:39:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jU+spU0xOLIz1KbJdNuExlufsF0C/h6g9VNbHe8MQOU=; b=kqRgZNZbxGVo+oA+5TYg/yHWyj NOq0pPAS/EYmYoXH2nGWulBixa/nSXChbP4rzUoX2NXxw7fOzc5tark9TgSQnz7mwOKvTZ1ZRejAa 7t+m9ieGwboKNRZziO+L+AnUyHDgckGsH8JmIMtA77RboRlqHx0Ow+vl3iRT8iUhLyFE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=jU+spU0xOLIz1KbJdNuExlufsF0C/h6g9VNbHe8MQOU=; b=K+ZIAz3EJyVj239xlgFl0ezyXY lrmW1MsbnHDSIvlXX3LDbJMamzARB49FGvROlH/yU46Qm2O7To6liO61xBqxrqi67ZcsDD4VWVWHy 8yA3puHEp/Brpg0MaWd6VXqOBkDxYXtcDA0bl5oX8sD0disAVoL4sBh9RrdBGzhF4PSw=; Received: from dcvr.yhbt.net ([64.71.152.64]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1k1RVD-00FjFI-Iw for sox-devel@lists.sourceforge.net; Fri, 31 Jul 2020 09:39:00 +0000 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 6A8D31F8E0; Fri, 31 Jul 2020 09:38:02 +0000 (UTC) From: Eric Wong To: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Fri, 31 Jul 2020 09:37:56 +0000 Message-Id: <20200731093801.23548-5-normalperson@yhbt.net> In-Reply-To: <20200731093801.23548-1-normalperson@yhbt.net> References: <20200731093801.23548-1-normalperson@yhbt.net> MIME-Version: 1.0 X-Headers-End: 1k1RVD-00FjFI-Iw Subject: [PATCH RESEND 4/9] sndio: handle 24-bit samples properly on OpenBSD X-BeenThere: sox-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: sox-devel@lists.sourceforge.net Cc: sox-devel@lists.sourceforge.net, Alexandre Ratchov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: sox-devel-bounces@lists.sourceforge.net From: Alexandre Ratchov Reported-by: Jan Stary cf. http://marc.info/?l=openbsd-ports&m=147395657332262&w=2 --- src/sndio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sndio.c b/src/sndio.c index e031b5bb..77785ce4 100644 --- a/src/sndio.c +++ b/src/sndio.c @@ -113,8 +113,6 @@ static int startany(sox_format_t *ft, unsigned mode) else reqpar.rchan = ft->signal.channels; } - if (ft->signal.precision > 0) - reqpar.bits = ft->signal.precision; switch (ft->encoding.encoding) { case SOX_ENCODING_SIGN2: reqpar.sig = 1; @@ -127,6 +125,12 @@ static int startany(sox_format_t *ft, unsigned mode) } if (ft->encoding.bits_per_sample > 0) reqpar.bits = ft->encoding.bits_per_sample; + else if (ft->signal.precision > 0) + reqpar.bits = ft->signal.precision; + else + reqpar.bits = SOX_DEFAULT_PRECISION; + reqpar.bps = (reqpar.bits + 7) / 8; + reqpar.msb = 1; if (ft->encoding.reverse_bytes != sox_option_default) { reqpar.le = SIO_LE_NATIVE; if (ft->encoding.reverse_bytes) _______________________________________________ SoX-devel mailing list SoX-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/sox-devel