Commit 2f217729 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: vidtv: cleanup SDT string identifiers 



In order to better test userspace applications, add an encoding
for the strings. The original channel string is also too big.
As we're just playing the first compasses of the 5th Beethoven
Symphony, change the service name to just "Beethoven". Also,
add a provider's name. For such purpose, let's point it to
the Linux media community website.

With such changes, the SDT table now looks more like one got
from a real digital TV channel:

SDT
| table_id         0x42
| section_length      44
| one                 2
| zero                1
| syntax              1
| transport_stream_id 1860
| current_next        1
| version             0
| one2                3
| section_number      0
| last_section_number 0
| network_id          65281
| reserved            255
|\
|- service 0x0880
|   EIT schedule          0
|   EIT present following 0
|   free CA mode          0
|   running status        4
|   descriptor length     27
|        0x48: service_descriptor
|           service type  1
|           provider      'LinuxTV.org'
|           name          'Beethoven'
|_  1 services

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fc4405a5

drivers/media/test-drivers/vidtv/vidtv_channel.c

+5 −2
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ static void vidtv_channel_encoder_destroy(struct vidtv_encoder *e) 
	}

}



#define ENCODING_ISO8859_15 "\x0b"



struct vidtv_channel

*vidtv_channel_s302m_init(struct vidtv_channel *head, u16 transport_stream_id)

{
@@ -55,7 +57,8 @@ struct vidtv_channel 
	const u16 s302m_es_pid              = 0x111; /* packet id for the ES */

	const __be32 s302m_fid              = cpu_to_be32(VIDTV_S302M_FORMAT_IDENTIFIER);



	char *name = "S302m: Sine Wave PCM Audio";

	char *name = ENCODING_ISO8859_15 "Beethoven";

	char *provider = ENCODING_ISO8859_15 "LinuxTV.org";



	struct vidtv_channel *s302m = kzalloc(sizeof(*s302m), GFP_KERNEL);

	struct vidtv_s302m_encoder_init_args encoder_args = {};
@@ -68,7 +71,7 @@ struct vidtv_channel 
				     vidtv_psi_service_desc_init(NULL,

								 DIGITAL_TELEVISION_SERVICE,

								 name,

								 NULL);

								 provider);



	s302m->transport_stream_id = transport_stream_id;