[15/31] media: vidtv: properly fill EIT service_id

Message ID	9c43dd04a208ee9a9aa19962d1da56b7c16bccf3.1606215584.git.mchehab+huawei@kernel.org
State	Accepted
Commit	91a8a240e2806c37eaf730347831f4a7de1535ac
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, "Daniel W. S. Almeida" <dwlsalmeida@gmail.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 15/31] media: vidtv: properly fill EIT service_id Date: Tue, 24 Nov 2020 12:06:11 +0100 Message-Id: <9c43dd04a208ee9a9aa19962d1da56b7c16bccf3.1606215584.git.mchehab+huawei@kernel.org> In-Reply-To: <cover.1606215584.git.mchehab+huawei@kernel.org> References: <cover.1606215584.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab <mchehab@kernel.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk
Series	vidtv: address several issues at the driver \| expand [00/31] vidtv: address several issues at the driver [01/31] media: vidtv: reorganize includes [02/31] media: vidtv: add error checks [03/31] media: vidtv: don't use recursive functions [04/31] media: vidtv: fix the name of the program [05/31] media: vidtv: fix the tone generator logic [06/31] media: vidtv: fix some notes at the tone generator [07/31] media: vidtv: avoid data copy when initializing the multiplexer [08/31] media: vidtv: avoid copying data for PES structs [09/31] media: vidtv: do some cleanups at the driver [10/31] media: vidtv: remove some unused functions [11/31] media: vidtv: pre-initialize mux arrays [12/31] media: vidtv: cleanup null packet initialization logic [13/31] media: vidtv: improve EIT data [14/31] media: vidtv: fix the network ID range [15/31] media: vidtv: properly fill EIT service_id [16/31] media: vidtv: add a PID entry for the NIT table [17/31] media: vidtv: fix service type [18/31] media: vidtv: fix service_id at SDT table [19/31] media: vidtv: add date to the current event [20/31] media: vidtv: simplify PSI write function [21/31] media: vidtv: simplify the crc writing logic [22/31] media: vidtv: cleanup PSI descriptor write function [23/31] media: vidtv: cleanup PSI table header function [24/31] media: vidtv: cleanup PAT write function [25/31] media: vidtv: cleanup PMT write table function [26/31] media: vidtv: simplify SDT write function [27/31] media: vidtv: simplify NIT write function [28/31] media: vidtv: simplify EIT write function [29/31] media: vidtv.rst: update vidtv documentation [30/31] media: vidtv.rst: add kernel-doc markups [31/31] media: vidtv: cleanup a few coding style issues

Message ID

9c43dd04a208ee9a9aa19962d1da56b7c16bccf3.1606215584.git.mchehab+huawei@kernel.org

State

Accepted

Commit

91a8a240e2806c37eaf730347831f4a7de1535ac

Headers

From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
	"Daniel W. S. Almeida" <dwlsalmeida@gmail.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	linux-kernel@vger.kernel.org, linux-media@vger.kernel.org
Subject: [PATCH 15/31] media: vidtv: properly fill EIT service_id
Date: Tue, 24 Nov 2020 12:06:11 +0100
Message-Id: <9c43dd04a208ee9a9aa19962d1da56b7c16bccf3.1606215584.git.mchehab+huawei@kernel.org>
In-Reply-To: <cover.1606215584.git.mchehab+huawei@kernel.org>
References: <cover.1606215584.git.mchehab+huawei@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: Mauro Carvalho Chehab <mchehab@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Precedence: bulk

Series

vidtv: address several issues at the driver | expand

Commit Message

Mauro Carvalho Chehab Nov. 24, 2020, 11:06 a.m. UTC

The EIT header ID field should not contain the network ID, but,
instead, the service_id of the program described at EIT.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 drivers/media/test-drivers/vidtv/vidtv_channel.c | 3 ++-
 drivers/media/test-drivers/vidtv/vidtv_psi.c     | 5 +++--
 drivers/media/test-drivers/vidtv/vidtv_psi.h     | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c
index 84c4f3f25f77..d1d312566bc0 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_channel.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c
@@ -451,7 +451,8 @@  int vidtv_channel_si_init(struct vidtv_mux *m)
 		goto free_service_list;
 
 	m->si.eit = vidtv_psi_eit_table_init(m->network_id,
-					     m->transport_stream_id);
+					     m->transport_stream_id,
+					     programs->service_id);
 	if (!m->si.eit)
 		goto free_nit;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/test-drivers/vidtv/vidtv_psi.c
index 341af312ad56..02dd217bdbf6 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c
@@ -1809,7 +1809,8 @@  void vidtv_psi_eit_event_assign(struct vidtv_psi_table_eit *eit,
 
 struct vidtv_psi_table_eit
 *vidtv_psi_eit_table_init(u16 network_id,
-			  u16 transport_stream_id)
+			  u16 transport_stream_id,
+			  __be16 service_id)
 {
 	struct vidtv_psi_table_eit *eit;
 	const u16 SYNTAX = 0x1;
@@ -1824,7 +1825,7 @@  struct vidtv_psi_table_eit
 
 	eit->header.bitfield = cpu_to_be16((SYNTAX << 15) | (ONE << 14) | (ONES << 12));
 
-	eit->header.id = cpu_to_be16(network_id);
+	eit->header.id = service_id;
 	eit->header.current_next = ONE;
 
 	eit->header.version = 0x1f;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.h b/drivers/media/test-drivers/vidtv/vidtv_psi.h
index 866fdf3d00e5..26b2c2f5774c 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.h
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.h
@@ -739,7 +739,8 @@  struct vidtv_psi_table_eit {
 
 struct vidtv_psi_table_eit
 *vidtv_psi_eit_table_init(u16 network_id,
-			  u16 transport_stream_id);
+			  u16 transport_stream_id,
+			  u16 service_id);
 
 
 /**

[15/31] media: vidtv: properly fill EIT service_id

Commit Message

Patch