From patchwork Sat Feb 3 02:36:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 196135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp817055dyc; Fri, 2 Feb 2024 18:41:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IEudWdFWm3HWCOFCvBnpA5IrEN++5x4Llmwua/5+hBkAMj1auBxR1cl6mxDgNItQqzbJ13z X-Received: by 2002:a17:902:be02:b0:1d7:8f22:62f5 with SMTP id r2-20020a170902be0200b001d78f2262f5mr9172338pls.61.1706928065889; Fri, 02 Feb 2024 18:41:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706928065; cv=pass; d=google.com; s=arc-20160816; b=qC9g/eWjG41bvJtcFmYVlQnyr4r/HsioHSMRPWNBSeW3uPLKCeVY0OsRaxGWiId6WK Xh6j3zls56wFjBzW8NJbiyI2UstwcoyP0I9v6twccKuM2EsegvWvR0s412C1wgncUTV/ 8WUrkbGF+PLE1rQPurR24Xfc8V1ml4xdadjG4sv0rtyVl6zQ+/1cAGaerHytG+swviyP z4fxLhA+Ze9BIsmmqYAa2kx3P5vxjIQOM5IrAIoq0xqIR8XCCtHRCKu5HAA61k0HF80W X9a4FL/ttdybLnNuVdMQO+/gITlJFQ5ycAwb3QdrGawC1mGdnr8dRu41/fr2vowlO8dT LWgg== ARC-Message-Signature: i=2; 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=BGwScFfI9TnNrH/OdgFrvaPbJHnNRbrE6XmBBPYfzac=; b=WM5sFem1tCCjEaBNbVd0AiAEWcPnpwRc9FOIri7jv1EWR+6G/KeTowwbJ8aoa1Q6HZ fGsMfNxVCumCT4rtlTPyXHU8cQPTSgo1QeqVMpEAUNVa9GTr4NAyy7v1JIhcII42lUsU os1eGExU35mxgeypRMfZgUt/ifPpc9DAzPpAaBJgw5IwBiDZR0alBDaPvYxI6EyiLA1a wKQKnKZSryE7AI9QqqwANzkxtm+Xaa6eszpfE2rujsqhcJ1CwHKuqHVo33fYAvjuVAIX Na4bCNL0c50yIM+FoKpdmWQHj6dP2OHUW0w/0Z9KBwCTxxsBrvKb934Zia2Ku3F6gwzP 0UjA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=GcdPr98g; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-50829-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-50829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com X-Forwarded-Encrypted: i=1; AJvYcCX9teCp6k+uN0nfYWSOYTRk5ub8qt2wr455BYytbBadwZvu6GiEJHXhxNUewQKx0MG4b2i0yxbCWAJOyMpDOvhCdEKWEw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id u18-20020a170902e21200b001d8f9b3ed79si2591053plb.86.2024.02.02.18.41.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 18:41:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-50829-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=GcdPr98g; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-50829-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-50829-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 9BEB628ADC9 for ; Sat, 3 Feb 2024 02:41:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C196A17BB3; Sat, 3 Feb 2024 02:37:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="GcdPr98g" 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 C0A6C46BF; Sat, 3 Feb 2024 02:37:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706927868; cv=none; b=S2atFvikeLkTrzeEyuOsN9wPnko8zIepHjCXU3/WwjJSsU3VBhgQ/H6nGDQnlEzGFO6v18ixY9lurtPLKwHziMAFXEj+WXdtnyVfeZMFTbseUqS+99pR2AYqRqdUeyTqF6LIElTAnChX/fRzgBlLKVgB2KAiWo3k7UZWoy7T0p0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706927868; c=relaxed/simple; bh=e35zs7ZNspt8pL25lL7WgCnt43ssCmNv3V8Typ76tw4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dztQOPfiBo6Q58X/hc+rQ4zKpZTWbA4dn7qUGOuIvGGkNyfeNjjst2hejfgd+fIsg6tk8kGuYb02oN/dqBwd/E7iwj6XwByw63sEt4orOdLFTMOyEdLyk7ehYghGdCFf2IrqelQpgQtP+Xuv4qEIe8NilAuAVrN9qezJSqunVtk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=GcdPr98g; arc=none smtp.client-ip=205.220.168.131 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 (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 4132UPm1020227; Sat, 3 Feb 2024 02:37:26 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=GcdPr98gNziIjDpURGyB8TVyquelSmbZSHtf Sx/CO0U46Uen/FOPX8RlH5uVEku2QBjAdSfe+olnX/i031lvVwcP1E4vP+18MCQb NKjfrtsp4RjlNfETLJvDm1EJrpq3e/omo5tEfg/T7VhuclxbTmgzssYjHBajgOCN pX1wUOvVZXsJw5pDO42eccTSWUrM21YZkTJPIz03SRW6U/vOLIqDWwWBs2aQBCDY 4vwWZ2XSXBNdvGVakCmFDn4gPjzzNk4LdaVtIh/QzQFY9UR7D6uNQGHvgzWxDS9G 7cLqIbefCLc0tPastmyzpACrILx3ITdjxbd6xxvQqcDvjZRbZg== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3w1ceug0t2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 Feb 2024 02:37:26 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 4132bP4U024771 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 3 Feb 2024 02:37:25 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; Fri, 2 Feb 2024 18:37:25 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v13 27/53] ALSA: usb-audio: Save UAC sample size information Date: Fri, 2 Feb 2024 18:36:19 -0800 Message-ID: <20240203023645.31105-28-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240203023645.31105-1-quic_wcheng@quicinc.com> References: <20240203023645.31105-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: nalasex01b.na.qualcomm.com (10.47.209.197) 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-GUID: 2ze41rVHle5LHk4swWO7-clgoI9f6NG2 X-Proofpoint-ORIG-GUID: 2ze41rVHle5LHk4swWO7-clgoI9f6NG2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-02_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0 clxscore=1015 bulkscore=0 mlxscore=0 spamscore=0 impostorscore=0 mlxlogscore=997 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402030015 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789843803489664837 X-GMAIL-MSGID: 1789843803489664837 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))) {