From patchwork Thu Feb 8 23:13:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 198697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp525045dyd; Thu, 8 Feb 2024 15:52:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpCiCAk81yLC04VA4t3pSQKAl93K8Inr4dP07nl9N1sM5wqn3aFNEL2g9mJK6S5ra7q9Pm X-Received: by 2002:a17:90a:3f88:b0:296:833a:b47f with SMTP id m8-20020a17090a3f8800b00296833ab47fmr966981pjc.21.1707436345122; Thu, 08 Feb 2024 15:52:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707436345; cv=pass; d=google.com; s=arc-20160816; b=HwCIpEOGkhPKjWwhZJWtBQhrhszmi/MSGdLXQRFlrHJdj+RGQE+GJKVe2yOrNnqT5u fendUkx+g4fqkP2TUizAvD1EA/TBTT4YziC0sIVcZdHuhR8bpHrpYBLwHzN61gtNcHF1 xyvjGX67bHVEUudnOIFlzYTU6iS7CmJ4GXmONMUjrjrKSUQlGfPoKfhOUXRljU0lNtHi eCq8T8bMm30Mt6HaZAsYSU5qclmqQn3QW0iRw+rIp/61NU5fygtIxGONYeTRQ14+nc42 IWQav0kcP6hvPf76M73pWzQiSVyRW7+nly3McIfUtkS4keDy7JKCReQidkof9LFjWb9m c99g== 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=OmWrLqmxCc1gmz0F5H4ayXFYXg4kpYMbtf+6t7yApQ4=; b=fEdJHGijha84hFsap56SiWVplVjXJDqbBPmBKYZlfmJ6yeiN0HyvnSjvCid/9rUKrL aSf29Lc0JGn6NlcGSCpUECXXlJsNkPxJiSYyM7bO1BvqN+zY0H5KI5ot1mJM68D9zAVj czrDSHMbVgsRyEgOuAdysfV/YGVKTm8JpbrFn7UoGF2CPBaq2xYaIJhPWzXs/XHYaK5G w0a18JoEoVXgVlznEByevdb9yfh2Qofm9tX/C8yvpbilweAzy8extZ5BxKjevwPDu/9k 0229+kR9WAtkZs+wXxiOkbfcwxDvHKH9KDiLVxZxK/m/BWxyQaAtPgyb3xHlSC2UzDh6 EA1g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=IqSGZ33a; 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-58813-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58813-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com X-Forwarded-Encrypted: i=2; AJvYcCU2qq2z1BOyzDNmFuIKRM6Oppk7wMX2tY4NeN/yvrP4Yf6lnWKtxhu/SaVrggljiMUecjhz/8pofQ8IedmVjA45VF6RvQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id lk16-20020a17090b33d000b002931f778063si590161pjb.67.2024.02.08.15.52.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 15:52:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-58813-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=IqSGZ33a; 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-58813-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58813-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 6FD23B2D020 for ; Thu, 8 Feb 2024 23:25:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 561665F552; Thu, 8 Feb 2024 23:14:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="IqSGZ33a" Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 01C6050A88; Thu, 8 Feb 2024 23:14:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707434080; cv=none; b=KJ1uz78cvDdfkbnU6Rb6ye9t992JjVXMU27pQ1nhX/1ELm5Dx+w+AYb/7w44DW5KRoEdeu6tJHRVLge8USVMhgUw2CRhxV9daQjjFoIzPDkaT8EaaiNE/2SMCNC5PECksAiOG3bxnWhLmi1tyDkoldD8CaGiu8a8hhnN3qN7TsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707434080; c=relaxed/simple; bh=e35zs7ZNspt8pL25lL7WgCnt43ssCmNv3V8Typ76tw4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ag/zLssiBc9NDXHN/tcgYBol9fvn/HQhqOVku2L6ngdrceYtTjjSjf91tXJ+vSdNlCODPhjTA8s4EsYoadBmWQupUg6QfU1agH2pJHbGkk8KveZEIN+ou6pGEr+sNo1GnjKyUqM7uQzd6EqyToDgO+n87pb4RREA6XnFQni5G4s= 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=IqSGZ33a; arc=none smtp.client-ip=205.220.180.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 (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 418JMJJ3024949; Thu, 8 Feb 2024 23:14:24 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=IqSGZ33a0/mWGgAaiW0g3yzj74WbhCWnEyT7 bNpBs+K36ieh2WuyqySsKLGkh+vKwWa0JCqTPG4UAFZmTS0WgAtiny/cDqkix0YA 74q7Okd1nKBaZ0vBSVkKiOMbX6VFhFhZ91kGwCkF9o6xQQw6H4JpJOXtlb3KNU1g 52dHa0b7ttI8kQUjdYEQ1O9FMoLPdDXm/I8DUXx0rTcBCQtk36y1AdbgMeY3vIHG tAPGJ9V0/S4DmzwU1laRdrQq4AaGZXRGmRLNu5iiltk3n5htTQz5L8aC6maWCoA8 QLa3HoOlblKwnbAFN89bBZOzsOPWxOi7xAPQZEjIbtuAezAfMQ== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3w4hhkbaj8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 08 Feb 2024 23:14:24 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 418NENdI012256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 8 Feb 2024 23:14:23 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; Thu, 8 Feb 2024 15:14:23 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v14 27/53] ALSA: usb-audio: Save UAC sample size information Date: Thu, 8 Feb 2024 15:13:40 -0800 Message-ID: <20240208231406.27397-28-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240208231406.27397-1-quic_wcheng@quicinc.com> References: <20240208231406.27397-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: nalasex01c.na.qualcomm.com (10.47.97.35) 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: lBsbiqdlLJVPpWaN2BYOe6MyqWBwxgPP X-Proofpoint-GUID: lBsbiqdlLJVPpWaN2BYOe6MyqWBwxgPP 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-08_11,2024-02-08_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 spamscore=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402080131 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790376773173855672 X-GMAIL-MSGID: 1790376773173855672 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))) {