From nobody Sat May 10 05:41:18 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=1606216045; cv=none; d=zohomail.com; s=zohoarc; b=LLGqKGeDyqAVJXACkpK6rsFxN9WPNHBQHSTmCuMvBg+3Pbw+nZIA01OYNE59R4DyMlHd2sJ8lfM80UJmnuL9iZRjGLfWjCf0HahVKtqXD+y/PRh6haKv8LhmjviPkr+QLKT2BwAHNsDFmdEM4qaY5gFMId5fHBmbU8dI0F0tUWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606216045; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jcc/VJHvYpi7XM6yQDu4mBLVDa7RVEShUrIUs2QB5bQ=; b=RCqDmkOtl2b0mVhcDQ6LKULE7LBpat4HhAhU9bBEdZi49igJyAPSCAFvhTKeQnc3YvLge38RRaC0tRg3eKqMsuV8KIZdVSoU3nkO4wkml+/ineqlQ7dXo4H1khFMizezwm2T9UKPdbrZZryq6e25NaoqwgzTVZeFAfTCKmmYiRI= 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 1606216045599792.2883653649129; Tue, 24 Nov 2020 03:07:25 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732695AbgKXLHS (ORCPT ); Tue, 24 Nov 2020 06:07:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:33786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732502AbgKXLGf (ORCPT ); Tue, 24 Nov 2020 06:06:35 -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 3B2E221D91; 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-000FaQ-7v; 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=G8UWMrAUt24/HbKnZvnooFJrDZrmNrdEOJgz3oaGdv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rBQjnRPAFoG7y37aqf/oByF3J0XEiw1LAFPRR9gIZ0vLXwUAWqWMr0soers0FB9D2 8SzVK1oJk2FfZmzeqErmDvQR058JlOlx+HW/rP3SDZqf8pVSntetAvo5zFMgyAMzuz fLNAWsx494AFUllJ9KFdxjN4AxK4lt/pxwdm3+7U= 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 24/31] media: vidtv: cleanup PAT write function Date: Tue, 24 Nov 2020 12:06:20 +0100 Message-Id: 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" Avoid initializing the structs multiple times and pass the PAT struct as a pointer, instead of a var. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/test-drivers/vidtv/vidtv_mux.c | 2 +- drivers/media/test-drivers/vidtv/vidtv_psi.c | 57 ++++++++++---------- drivers/media/test-drivers/vidtv/vidtv_psi.h | 2 +- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/t= est-drivers/vidtv/vidtv_mux.c index 0cf784c09024..200a8000603f 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_mux.c +++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c @@ -173,7 +173,7 @@ static u32 vidtv_mux_push_si(struct vidtv_mux *m) pat_args.offset =3D m->mux_buf_offset; pat_args.continuity_counter =3D &pat_ctx->cc; =20 - m->mux_buf_offset +=3D vidtv_psi_pat_write_into(pat_args); + m->mux_buf_offset +=3D vidtv_psi_pat_write_into(&pat_args); =20 for (i =3D 0; i < m->si.pat->num_pmt; ++i) { pmt_pid =3D vidtv_psi_pmt_get_pid(m->si.pmt_secs[i], diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/t= est-drivers/vidtv/vidtv_psi.c index 1bc13b0d5fc6..29f35d5faf25 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.c +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c @@ -961,57 +961,60 @@ struct vidtv_psi_table_pat *vidtv_psi_pat_table_init(= u16 transport_stream_id) return pat; } =20 -u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args args) +u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args *args) { - struct vidtv_psi_table_pat_program *p =3D args.pat->program; - struct header_write_args h_args =3D {}; - struct psi_write_args psi_args =3D {}; - struct crc32_write_args c_args =3D {}; - const u16 pat_pid =3D VIDTV_PAT_PID; + struct vidtv_psi_table_pat_program *p =3D args->pat->program; + struct header_write_args h_args =3D { + .dest_buf =3D args->buf, + .dest_offset =3D args->offset, + .pid =3D VIDTV_PAT_PID, + .h =3D &args->pat->header, + .continuity_counter =3D args->continuity_counter, + .dest_buf_sz =3D args->buf_sz, + }; + struct psi_write_args psi_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_PAT_PID, + .new_psi_section =3D false, + .continuity_counter =3D args->continuity_counter, + .is_crc =3D false, + .dest_buf_sz =3D args->buf_sz, + }; + struct crc32_write_args c_args =3D { + .dest_buf =3D args->buf, + .pid =3D VIDTV_PAT_PID, + .dest_buf_sz =3D args->buf_sz, + }; u32 crc =3D INITIAL_CRC; u32 nbytes =3D 0; =20 - vidtv_psi_pat_table_update_sec_len(args.pat); + vidtv_psi_pat_table_update_sec_len(args->pat); =20 - h_args.dest_buf =3D args.buf; - h_args.dest_offset =3D args.offset; - h_args.h =3D &args.pat->header; - h_args.pid =3D pat_pid; - h_args.continuity_counter =3D args.continuity_counter; - h_args.dest_buf_sz =3D args.buf_sz; h_args.crc =3D &crc; =20 nbytes +=3D vidtv_psi_table_header_write_into(&h_args); =20 /* note that the field 'u16 programs' is not really part of the PAT */ =20 - psi_args.dest_buf =3D args.buf; - psi_args.pid =3D pat_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.crc =3D &crc; + psi_args.crc =3D &crc; =20 while (p) { /* copy the PAT programs */ psi_args.from =3D p; /* skip the pointer */ psi_args.len =3D sizeof(*p) - - sizeof(struct vidtv_psi_table_pat_program *); - psi_args.dest_offset =3D args.offset + nbytes; + sizeof(struct vidtv_psi_table_pat_program *); + 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 p =3D p->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.continuity_counter =3D args->continuity_counter; c_args.crc =3D cpu_to_be32(crc); - c_args.pid =3D pat_pid; - c_args.continuity_counter =3D args.continuity_counter; - c_args.dest_buf_sz =3D args.buf_sz; =20 /* Write the CRC32 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 1bf0103e6840..ba5c91a0d387 100644 --- a/drivers/media/test-drivers/vidtv/vidtv_psi.h +++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h @@ -556,7 +556,7 @@ struct vidtv_psi_pat_write_args { * equal to the size of the PAT, since more space is needed for TS headers= during TS * encapsulation. */ -u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args args); +u32 vidtv_psi_pat_write_into(struct vidtv_psi_pat_write_args *args); =20 /** * struct vidtv_psi_sdt_write_args - Arguments for writing a SDT table --=20 2.28.0