From patchwork Wed Dec 20 22:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 181854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp61916dyi; Wed, 20 Dec 2023 15:05:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtO0H9paHy58ThyKbqR0DQWNRq2rNpXOn4vpWpjLuLWzc23FvNRpDO9ARTHu+qhQsNg9Gz X-Received: by 2002:aa7:93a9:0:b0:6d3:5470:83fa with SMTP id x9-20020aa793a9000000b006d3547083famr3984585pff.23.1703113520333; Wed, 20 Dec 2023 15:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703113520; cv=none; d=google.com; s=arc-20160816; b=Ug72tPtyh5VaR68Z6N7YpnHqHgs0NbdlpFD6+yhch22MNDnri1iLWfFgdWt6UuyTWd b63ocEE/WOakrMmqNNoGVhARFNU4+s+0Eyt46N+xUx8nlAzdm7AEbeMDaGMgt89u9BAv m4TcRv7etnpexqPtYufYDP6PXeQ6Jp3wSG6uJeVOrxPOdAoD281ZOl6WrWHmR9Sq12Mj h4DA0aauH4UCZqdHPAnAXVwvamexzswKiEaHuS2vvAWzF6q/d7tUqVFbvWUzQhbByEC4 /w9sdxQgQzkjGOI3XFxWXtzvXbTuFwA2YE8vdZbN3CIWqymgkVL2jK8Nwq70MH/SKDH+ ELtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QAId/huwU+vLycR1v5ldlqmYb6477nfIMJClVSaqa9U=; fh=0KzismZj+xI0Z//ZGdqKIH/FO9LtSZM7Yj4P0VtrCz0=; b=FdZDcq7U9Wo4JdOgOi8Ksa3AuIjvoeMrGC+0KdrDXqLWkvSB8+SA1OQeL8xIERkkV9 +kYv7uGDYmHcxpmCRniTXGtMataVZFz0WzoQ4UJ22rmk5w/XgsejJv9NAnVKsDQNhKhG NV3ISw7S+iglN+lYLmKL58j4GuRykY+YG+NsWQ3zjWtoDLm62zQBA7ldH/3Lp4nFLsaV 6PYkD3B8UoiG7s3sMh0pVDgR7+45HcDGLfYCvsS8WZZ4dw+XKAFGwhzM8aq8MsY2to3I bTlATNXQJThCz5hDhsyYsjD3QslHpOMO4l5e7qP3QhaDG7ye04pObNAZfaqbq6xozcbM VC4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=esw0frrS; spf=pass (google.com: domain of linux-kernel+bounces-7587-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7587-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id c34-20020a630d22000000b005c65ed0f692si491430pgl.141.2023.12.20.15.05.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 15:05:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7587-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=esw0frrS; spf=pass (google.com: domain of linux-kernel+bounces-7587-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7587-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 202A9281561 for ; Wed, 20 Dec 2023 23:05:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B0E2170995; Wed, 20 Dec 2023 22:46:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="esw0frrS" X-Original-To: linux-kernel@vger.kernel.org Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F2F154F96; Wed, 20 Dec 2023 22:46:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BKMEkc1021107; Wed, 20 Dec 2023 22:45:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=QAId/huwU+vLycR1v5ld lqmYb6477nfIMJClVSaqa9U=; b=esw0frrSLfMZltL6DP6BXDYf6J2BxfvwNOQF O3EyrYNp4miULoPr8wImo9QruzdUZk3IJcS6BI/P4xywREl4LK0YHhYAzqiBv9X2 8wI1CFoCZ1Xhs5rj2jaI0YzuPQQrOqILMOEhBjZGOou/ly6JsO1OTw7hPAKqK80+ uHW2iB0StfdvhbeuHzFRB+cp0x1sM62aYpkEkjJbVv+Ji22uaiVAl58cFl0NMry+ 6ve4BxJ3PXxCzr6tDYlO5Qpme0oxI0NU6W/OwEwpasm0WsJFGh1ix3ky7p5F+Foz SxomrvWfiUgz2KTwlQLfq26XqcbPBlMP7rGJx4uaCpqjJGrpgQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3v3xhnhtu1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:45:58 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3BKMjvOw016422 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 20 Dec 2023 22:45:57 GMT Received: from hu-wcheng-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 20 Dec 2023 14:45:57 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v11 13/41] ALSA: usb-audio: Save UAC sample size information Date: Wed, 20 Dec 2023 14:45:16 -0800 Message-ID: <20231220224544.18031-14-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231220224544.18031-1-quic_wcheng@quicinc.com> References: <20231220224544.18031-1-quic_wcheng@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nalasex01a.na.qualcomm.com (10.47.209.196) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: gVTTHiyPYotqtFwWnZUeEm2JSihv-3n0 X-Proofpoint-GUID: gVTTHiyPYotqtFwWnZUeEm2JSihv-3n0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-09_01,2023-12-07_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 adultscore=0 bulkscore=0 mlxscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 suspectscore=0 mlxlogscore=932 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2312200163 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785843962681124799 X-GMAIL-MSGID: 1785843962681124799 Within the UAC descriptor, there is information describing the size of a sample (bSubframeSize/bSubslotSize) and the number of relevant bits (bBitResolution). Currently, fmt_bits carries only the bit resolution, however, some offloading entities may also require the overall size of the sample. Save this information in a separate parameter, as depending on the UAC format type, the sample size can not easily be decoded from other exisiting parameters. Signed-off-by: Wesley Cheng --- sound/usb/card.h | 1 + sound/usb/format.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sound/usb/card.h b/sound/usb/card.h index 2884912adc96..02e4ea898db5 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -15,6 +15,7 @@ struct audioformat { unsigned int channels; /* # channels */ unsigned int fmt_type; /* USB audio format type (1-3) */ unsigned int fmt_bits; /* number of significant bits */ + unsigned int fmt_sz; /* overall audio sub frame/slot size */ unsigned int frame_size; /* samples per frame for non-audio */ unsigned char iface; /* interface number */ unsigned char altsetting; /* corresponding alternate setting */ diff --git a/sound/usb/format.c b/sound/usb/format.c index ab5fed9f55b6..1721e4f360fb 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -80,6 +80,7 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, } fp->fmt_bits = sample_width; + fp->fmt_sz = sample_bytes; if ((pcm_formats == 0) && (format == 0 || format == (1 << UAC_FORMAT_TYPE_I_UNDEFINED))) {