From nobody Sun May 11 22:33:11 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1606216043; cv=none; d=zohomail.com; s=zohoarc; b=O+SaFBqezpMav9jQwDYqMVkqPMvYjVPouUinRpo232jOsK2tPE1XxTmnNYwXkjyXEjT7osXQn5XR4mHc8EWwwc9YLKeMoOWWmxFYtf+JGNukU8ly9VyAsAShajQUXQGM6y842aWSSYJ3OhdcuP76Z1eAw0T4FqeG+piqUHiIz48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216043; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7ApAJuucbeNcoq4lpQPWt7QXTdLuMfUTNkG9xNMDvJQ=; b=ZJyxjfJrg8nS9HmHBP3xfMG3zZU09VircKYGHftyyb1079XUFiLWxvzZlqAaeHP5yGz33cVDP7/9Cn66Lv9fd3W+yrBM6P7qvB/h5RK//7UL31tGJ63t9x59YutFmqW5Dx+8nObIK2G/cbIPmY3rYnVcr43PblvrVxSJ+a71WMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1606216043245490.73269072050016; Tue, 24 Nov 2020 03:07:23 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732646AbgKXLHE (ORCPT ); Tue, 24 Nov 2020 06:07:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:33818 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732505AbgKXLGg (ORCPT ); Tue, 24 Nov 2020 06:06:36 -0500 Received: from mail.kernel.org (ip5f5ad5c3.dynamic.kabel-deutschland.de [95.90.213.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 44565221F9; Tue, 24 Nov 2020 11:06:31 +0000 (UTC) Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1khW9V-000FaV-9q; Tue, 24 Nov 2020 12:06:29 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606215991; bh=w/tJPJr6IOV6p4PXXs54u7f4fAHEeqps80vv1D4BmO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uz3BnRdmaQ3T+KINDENifiCSGQmoXeqoymmkVdKkRwhqdit3NHCI89/wkDnuxz/W3 I7BgVh+jrjJ/w8uj/MsjfePf4iOkj1/ZHdlOuwfRAZ65w8bcMgBx/vPbmrVRNgZYCy X4Zk50mWGYvebiAx3fDH8xeeL4PEhKUP7LepUnVs= From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , "Daniel W. S. Almeida" , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 26/31] media: vidtv: simplify SDT write function Date: Tue, 24 Nov 2020 12:06:22 +0100 Message-Id: <8f6c5baf950d66410e4df9826a8ef407caa5039d.1606215584.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" - pass struct vidtv_psi_sdt_write_args as a pointer; - avoid initializing struct fields multiple times. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_mux.c | 2 +- drivers/media/test-drivers/vidtv/vidtv_psi.c | 85 ++++++++++---------- drivers/media/test-drivers/vidtv/vidtv_psi.h | 2 +- 3 files changed, 46 insertions(+), 43 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/t= est-drivers/vidtv/vidtv_mux.c index 239e0a242b6e..ff1c7c586838 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_mux.c +++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c @@ -199,7 +199,7 @@ static u32 vidtv_mux_push_si(struct vidtv_mux *m) sdt_args.offset =3D m->mux_buf_offset; sdt_args.continuity_counter =3D &sdt_ctx->cc; =20 - m->mux_buf_offset +=3D vidtv_psi_sdt_write_into(sdt_args); + m->mux_buf_offset +=3D vidtv_psi_sdt_write_into(&sdt_args); =20 nit_args.offset =3D m->mux_buf_offset; nit_args.continuity_counter =3D &nit_ctx->cc; diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index ab349654ba54..ffa0ff493d04 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -1306,57 +1306,66 @@ struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_ini= t(u16 network_id, return sdt; } =20 -u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args) +u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args *args) { - struct vidtv_psi_table_sdt_service *service =3D args.sdt->service; + struct header_write_args h_args =3D { + .dest_buf =3D args->buf, + .dest_offset =3D args->offset, + .h =3D &args->sdt->header, + .pid =3D VIDTV_SDT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct psi_write_args psi_args =3D { + .dest_buf =3D args->buf, + .len =3D sizeof_field(struct vidtv_psi_table_sdt, network_id) + + sizeof_field(struct vidtv_psi_table_sdt, reserved), + .pid =3D VIDTV_SDT_PID, + .new_psi_section =3D false, + .is_crc =3D false, + .dest_buf_sz =3D args->buf_sz, + }; + struct desc_write_args d_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_SDT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct crc32_write_args c_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_SDT_PID, + .dest_buf_sz =3D args->buf_sz, + }; + struct vidtv_psi_table_sdt_service *service =3D args->sdt->service; struct vidtv_psi_desc *service_desc; - struct header_write_args h_args =3D {}; - struct psi_write_args psi_args =3D {}; - struct desc_write_args d_args =3D {}; - struct crc32_write_args c_args =3D {}; - u16 sdt_pid =3D VIDTV_SDT_PID; u32 nbytes =3D 0; u32 crc =3D INITIAL_CRC; =20 /* see ETSI EN 300 468 v1.15.1 p. 11 */ =20 - vidtv_psi_sdt_table_update_sec_len(args.sdt); + vidtv_psi_sdt_table_update_sec_len(args->sdt); =20 - h_args.dest_buf =3D args.buf; - h_args.dest_offset =3D args.offset; - h_args.h =3D &args.sdt->header; - h_args.pid =3D sdt_pid; - h_args.continuity_counter =3D args.continuity_counter; - h_args.dest_buf_sz =3D args.buf_sz; + h_args.continuity_counter =3D args->continuity_counter; h_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 - psi_args.dest_buf =3D args.buf; - psi_args.from =3D &args.sdt->network_id; - - psi_args.len =3D sizeof_field(struct vidtv_psi_table_sdt, network_id) + - sizeof_field(struct vidtv_psi_table_sdt, reserved); - - psi_args.dest_offset =3D args.offset + nbytes; - psi_args.pid =3D sdt_pid; - psi_args.new_psi_section =3D false; - psi_args.continuity_counter =3D args.continuity_counter; - psi_args.is_crc =3D false; - psi_args.dest_buf_sz =3D args.buf_sz; + psi_args.from =3D &args->sdt->network_id; + psi_args.dest_offset =3D args->offset + nbytes; + psi_args.continuity_counter =3D args->continuity_counter; psi_args.crc =3D &crc; =20 /* copy u16 network_id + u8 reserved)*/ nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 + /* skip both pointers at the end */ + psi_args.len =3D sizeof(struct vidtv_psi_table_sdt_service) - + sizeof(struct vidtv_psi_desc *) - + sizeof(struct vidtv_psi_table_sdt_service *); + while (service) { /* copy the services, if any */ psi_args.from =3D service; - /* skip both pointers at the end */ - psi_args.len =3D sizeof(struct vidtv_psi_table_sdt_service) - - sizeof(struct vidtv_psi_desc *) - - sizeof(struct vidtv_psi_table_sdt_service *); - psi_args.dest_offset =3D args.offset + nbytes; + psi_args.dest_offset =3D args->offset + nbytes; + psi_args.continuity_counter =3D args->continuity_counter; =20 nbytes +=3D vidtv_psi_ts_psi_write_into(&psi_args); =20 @@ -1364,12 +1373,9 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_wr= ite_args args) =20 while (service_desc) { /* copy the service descriptors, if any */ - d_args.dest_buf =3D args.buf; - d_args.dest_offset =3D args.offset + nbytes; + d_args.dest_offset =3D args->offset + nbytes; d_args.desc =3D service_desc; - d_args.pid =3D sdt_pid; - d_args.continuity_counter =3D args.continuity_counter; - d_args.dest_buf_sz =3D args.buf_sz; + d_args.continuity_counter =3D args->continuity_counter; d_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_desc_write_into(&d_args); @@ -1380,12 +1386,9 @@ u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_wr= ite_args args) service =3D service->next; } =20 - c_args.dest_buf =3D args.buf; - c_args.dest_offset =3D args.offset + nbytes; + c_args.dest_offset =3D args->offset + nbytes; c_args.crc =3D cpu_to_be32(crc); - c_args.pid =3D sdt_pid; - c_args.continuity_counter =3D args.continuity_counter; - c_args.dest_buf_sz =3D args.buf_sz; + c_args.continuity_counter =3D args->continuity_counter; =20 /* Write the CRC at the end */ nbytes +=3D table_section_crc32_write_into(&c_args); diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/t= est-drivers/vidtv/vidtv_psi.h index b72635bcdae7..5065ddb805b1 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.h +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h @@ -588,7 +588,7 @@ struct vidtv_psi_sdt_write_args { * equal to the size of the SDT, since more space is needed for TS headers= during TS * encapsulation. */ -u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args args); +u32 vidtv_psi_sdt_write_into(struct vidtv_psi_sdt_write_args *args); =20 /** * struct vidtv_psi_pmt_write_args - Arguments for writing a PMT section --=20 2.28.0