Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: vidtv.rst: add kernel-doc markups

Fix existing issues at the kernel-doc markups and add them to
the vidtv.rst file.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

+70 -32
+27
Documentation/driver-api/media/drivers/vidtv.rst
··· 484 484 - Updating the error statistics accordingly (e.g. BER, etc). 485 485 486 486 - Simulating some noise in the encoded data. 487 + 488 + Functions and structs used within vidtv 489 + --------------------------------------- 490 + 491 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_bridge.h 492 + 493 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_channel.h 494 + 495 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_demod.h 496 + 497 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_encoder.h 498 + 499 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_mux.h 500 + 501 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_pes.h 502 + 503 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_psi.h 504 + 505 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_s302m.h 506 + 507 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_ts.h 508 + 509 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_tuner.h 510 + 511 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_common.c 512 + 513 + .. kernel-doc:: drivers/media/test-drivers/vidtv/vidtv_tuner.c
+1 -1
drivers/media/test-drivers/vidtv/vidtv_bridge.h
··· 34 34 * @adapter: Represents a DTV adapter. See 'dvb_register_adapter'. 35 35 * @demux: The demux used by the dvb_dmx_swfilter_packets() call. 36 36 * @dmx_dev: Represents a demux device. 37 - * @dmx_frontend: The frontends associated with the demux. 37 + * @dmx_fe: The frontends associated with the demux. 38 38 * @i2c_adapter: The i2c_adapter associated with the bridge driver. 39 39 * @i2c_client_demod: The i2c_clients associated with the demodulator modules. 40 40 * @i2c_client_tuner: The i2c_clients associated with the tuner modules.
+1
drivers/media/test-drivers/vidtv/vidtv_channel.h
··· 39 39 * Every stream will have its corresponding encoder polled to produce TS packets 40 40 * These packets may be interleaved by the mux and then delivered to the bridge 41 41 * 42 + * @name: name of the channel 42 43 * @transport_stream_id: a number to identify the TS, chosen at will. 43 44 * @service: A _single_ service. Will be concatenated into the SDT. 44 45 * @program_num: The link between PAT, PMT and SDT.
+4 -6
drivers/media/test-drivers/vidtv/vidtv_demod.h
··· 20 20 * modulation and fec_inner 21 21 * @modulation: see enum fe_modulation 22 22 * @fec: see enum fe_fec_rate 23 + * @cnr_ok: S/N threshold to consider the signal as OK. Below that, there's 24 + * a chance of losing sync. 25 + * @cnr_good: S/N threshold to consider the signal strong. 23 26 * 24 27 * This struct matches values for 'good' and 'ok' CNRs given the combination 25 28 * of modulation and fec_inner in use. We might simulate some noise if the ··· 56 53 * struct vidtv_demod_state - The demodulator state 57 54 * @frontend: The frontend structure allocated by the demod. 58 55 * @config: The config used to init the demod. 59 - * @poll_snr: The task responsible for periodically checking the simulated 60 - * signal quality, eventually dropping or reacquiring the TS lock. 61 56 * @status: the demod status. 62 - * @cold_start: Whether the demod has not been init yet. 63 - * @poll_snr_thread_running: Whether the task responsible for periodically 64 - * checking the simulated signal quality is running. 65 - * @poll_snr_thread_restart: Whether we should restart the poll_snr task. 57 + * @tuner_cnr: current S/N ratio for the signal carrier 66 58 */ 67 59 struct vidtv_demod_state { 68 60 struct dvb_frontend frontend;
+3 -1
drivers/media/test-drivers/vidtv/vidtv_encoder.h
··· 103 103 * @encoder_buf_sz: The encoder buffer size, in bytes 104 104 * @encoder_buf_offset: Our byte position in the encoder buffer. 105 105 * @sample_count: How many samples we have encoded in total. 106 + * @access_units: encoder payload units, used for clock references 106 107 * @src_buf: The source of raw data to be encoded, encoder might set a 107 108 * default if null. 109 + * @src_buf_sz: size of @src_buf. 108 110 * @src_buf_offset: Our position in the source buffer. 109 111 * @is_video_encoder: Whether this a video encoder (as opposed to audio) 110 112 * @ctx: Encoder-specific state. 111 113 * @stream_id: Examples: Audio streams (0xc0-0xdf), Video streams 112 114 * (0xe0-0xef). 113 - * @es_id: The TS PID to use for the elementary stream in this encoder. 115 + * @es_pid: The TS PID to use for the elementary stream in this encoder. 114 116 * @encode: Prepare enough AUs for the given amount of time. 115 117 * @clear: Clear the encoder output. 116 118 * @sync: Attempt to synchronize with this encoder.
+4 -1
drivers/media/test-drivers/vidtv/vidtv_mux.h
··· 59 59 * @pat: The PAT in use by the muxer. 60 60 * @pmt_secs: The PMT sections in use by the muxer. One for each program in the PAT. 61 61 * @sdt: The SDT in use by the muxer. 62 + * @nit: The NIT in use by the muxer. 62 63 * @eit: the EIT in use by the muxer. 63 64 */ 64 65 struct vidtv_mux_si { ··· 87 86 88 87 /** 89 88 * struct vidtv_mux - A muxer abstraction loosely based in libavcodec/mpegtsenc.c 90 - * @mux_rate_kbytes_sec: The bit rate for the TS, in kbytes. 89 + * @fe: The frontend structure allocated by the muxer. 90 + * @dev: pointer to struct device. 91 91 * @timing: Keeps track of timing related information. 92 + * @mux_rate_kbytes_sec: The bit rate for the TS, in kbytes. 92 93 * @pid_ctx: A hash table to keep track of per-PID metadata. 93 94 * @on_new_packets_available_cb: A callback to inform of new TS packets ready. 94 95 * @mux_buf: A pointer to a buffer for this muxer. TS packets are stored there
+4 -1
drivers/media/test-drivers/vidtv/vidtv_pes.h
··· 113 113 * @dest_buf_sz: The size of the dest_buffer 114 114 * @pid: The PID to use for the TS packets. 115 115 * @continuity_counter: Incremented on every new TS packet. 116 - * @n_pes_h_s_bytes: Padding bytes. Might be used by an encoder if needed, gets 116 + * @wrote_pes_header: Flag to indicate that the PES header was written 117 + * @n_stuffing_bytes: Padding bytes. Might be used by an encoder if needed, gets 117 118 * discarded by the decoder. 119 + * @pcr: counter driven by a 27Mhz clock. 118 120 */ 119 121 struct pes_ts_header_write_args { 120 122 void *dest_buf; ··· 147 145 * @dts: DTS value to send. 148 146 * @n_pes_h_s_bytes: Padding bytes. Might be used by an encoder if needed, gets 149 147 * discarded by the decoder. 148 + * @pcr: counter driven by a 27Mhz clock. 150 149 */ 151 150 struct pes_write_args { 152 151 void *dest_buf;
+20 -19
drivers/media/test-drivers/vidtv/vidtv_psi.h
··· 43 43 STREAM_PRIVATE_DATA = 0x06, /* see ISO/IEC 13818-1 2000 p. 48 */ 44 44 }; 45 45 46 - /** 46 + /* 47 47 * struct vidtv_psi_desc - A generic PSI descriptor type. 48 48 * The descriptor length is an 8-bit field specifying the total number of bytes of the data portion 49 49 * of the descriptor following the byte defining the value of this field. ··· 55 55 u8 data[]; 56 56 } __packed; 57 57 58 - /** 58 + /* 59 59 * struct vidtv_psi_desc_service - Service descriptor. 60 60 * See ETSI EN 300 468 section 6.2.33. 61 61 */ ··· 71 71 char *service_name; 72 72 } __packed; 73 73 74 - /** 74 + /* 75 75 * struct vidtv_psi_desc_registration - A registration descriptor. 76 76 * See ISO/IEC 13818-1 section 2.6.8 77 77 */ ··· 93 93 u8 additional_identification_info[]; 94 94 } __packed; 95 95 96 - /** 96 + /* 97 97 * struct vidtv_psi_desc_network_name - A network name descriptor 98 98 * see ETSI EN 300 468 v1.15.1 section 6.2.27 99 99 */ ··· 110 110 struct vidtv_psi_desc_service_list_entry *next; 111 111 } __packed; 112 112 113 - /** 113 + /* 114 114 * struct vidtv_psi_desc_service_list - A service list descriptor 115 115 * see ETSI EN 300 468 v1.15.1 section 6.2.35 116 116 */ ··· 121 121 struct vidtv_psi_desc_service_list_entry *service_list; 122 122 } __packed; 123 123 124 - /** 124 + /* 125 125 * struct vidtv_psi_desc_short_event - A short event descriptor 126 126 * see ETSI EN 300 468 v1.15.1 section 6.2.37 127 127 */ ··· 142 142 char *event_name, 143 143 char *text); 144 144 145 - /** 145 + /* 146 146 * struct vidtv_psi_table_header - A header that is present for all PSI tables. 147 147 */ 148 148 struct vidtv_psi_table_header { ··· 158 158 u8 last_section; /* last_section_number */ 159 159 } __packed; 160 160 161 - /** 161 + /* 162 162 * struct vidtv_psi_table_pat_program - A single program in the PAT 163 163 * See ISO/IEC 13818-1 : 2000 p.43 164 164 */ ··· 168 168 struct vidtv_psi_table_pat_program *next; 169 169 } __packed; 170 170 171 - /** 171 + /* 172 172 * struct vidtv_psi_table_pat - The Program Allocation Table (PAT) 173 173 * See ISO/IEC 13818-1 : 2000 p.43 174 174 */ ··· 179 179 struct vidtv_psi_table_pat_program *program; 180 180 } __packed; 181 181 182 - /** 182 + /* 183 183 * struct vidtv_psi_table_sdt_service - Represents a service in the SDT. 184 184 * see ETSI EN 300 468 v1.15.1 section 5.2.3. 185 185 */ ··· 193 193 struct vidtv_psi_table_sdt_service *next; 194 194 } __packed; 195 195 196 - /** 196 + /* 197 197 * struct vidtv_psi_table_sdt - Represents the Service Description Table 198 198 * see ETSI EN 300 468 v1.15.1 section 5.2.3. 199 199 */ ··· 205 205 struct vidtv_psi_table_sdt_service *service; 206 206 } __packed; 207 207 208 - /** 208 + /* 209 209 * enum service_running_status - Status of a SDT service. 210 210 * see ETSI EN 300 468 v1.15.1 section 5.2.3 table 6. 211 211 */ ··· 213 213 RUNNING = 0x4, 214 214 }; 215 215 216 - /** 216 + /* 217 217 * enum service_type - The type of a SDT service. 218 218 * see ETSI EN 300 468 v1.15.1 section 6.2.33, table 81. 219 219 */ ··· 223 223 DIGITAL_RADIO_SOUND_SERVICE = 0X2, 224 224 }; 225 225 226 - /** 226 + /* 227 227 * struct vidtv_psi_table_pmt_stream - A single stream in the PMT. 228 228 * See ISO/IEC 13818-1 : 2000 p.46. 229 229 */ ··· 235 235 struct vidtv_psi_table_pmt_stream *next; 236 236 } __packed; 237 237 238 - /** 238 + /* 239 239 * struct vidtv_psi_table_pmt - The Program Map Table (PMT). 240 240 * See ISO/IEC 13818-1 : 2000 p.46. 241 241 */ ··· 477 477 * vidtv_psi_create_sec_for_each_pat_entry - Create a PMT section for each 478 478 * program found in the PAT 479 479 * @pat: The PAT to look for programs. 480 - * @s: The stream loop (one or more streams) 481 480 * @pcr_pid: packet ID for the PCR to be used for the program described in this 482 481 * PMT section 483 482 */ ··· 594 595 * @buf: The destination buffer. 595 596 * @offset: The offset into the destination buffer. 596 597 * @pmt: A pointer to the PMT. 598 + * @pid: Program ID 597 599 * @buf_sz: The size of the destination buffer. 598 600 * @continuity_counter: A pointer to the CC. Incremented on every new packet. 599 - * 601 + * @pcr_pid: The TS PID used for the PSI packets. All channels will share the 602 + * same PCR. 600 603 */ 601 604 struct vidtv_psi_pmt_write_args { 602 605 char *buf; ··· 714 713 715 714 void vidtv_psi_nit_table_destroy(struct vidtv_psi_table_nit *nit); 716 715 717 - /** 716 + /* 718 717 * struct vidtv_psi_desc_short_event - A short event descriptor 719 718 * see ETSI EN 300 468 v1.15.1 section 6.2.37 720 719 */ ··· 749 748 * struct vidtv_psi_eit_write_args - Arguments for writing an EIT section 750 749 * @buf: The destination buffer. 751 750 * @offset: The offset into the destination buffer. 752 - * @nit: A pointer to the NIT 751 + * @eit: A pointer to the EIT 753 752 * @buf_sz: The size of the destination buffer. 754 753 * @continuity_counter: A pointer to the CC. Incremented on every new packet. 755 754 *
+4 -1
drivers/media/test-drivers/vidtv/vidtv_s302m.h
··· 33 33 * @enc: A pointer to the containing encoder structure. 34 34 * @frame_index: The current frame in a block 35 35 * @au_count: The total number of access units encoded up to now 36 + * @last_duration: Duration of the tone currently being played 37 + * @note_offset: Position at the music tone array 38 + * @last_tone: Tone currently being played 36 39 */ 37 40 struct vidtv_s302m_ctx { 38 41 struct vidtv_encoder *enc; ··· 46 43 enum musical_notes last_tone; 47 44 }; 48 45 49 - /** 46 + /* 50 47 * struct vidtv_smpte_s302m_es - s302m MPEG Elementary Stream header. 51 48 * 52 49 * See SMPTE 302M 2007 table 1.
+2 -2
drivers/media/test-drivers/vidtv/vidtv_ts.h
··· 53 53 * @dest_offset: The byte offset into the buffer. 54 54 * @pid: The TS PID for the PCR packets. 55 55 * @buf_sz: The size of the buffer in bytes. 56 - * @countinuity_counter: The TS continuity_counter. 56 + * @continuity_counter: The TS continuity_counter. 57 57 * @pcr: A sample from the system clock. 58 58 */ 59 59 struct pcr_write_args { ··· 70 70 * @dest_buf: The buffer to write into. 71 71 * @dest_offset: The byte offset into the buffer. 72 72 * @buf_sz: The size of the buffer in bytes. 73 - * @countinuity_counter: The TS continuity_counter. 73 + * @continuity_counter: The TS continuity_counter. 74 74 */ 75 75 struct null_packet_write_args { 76 76 void *dest_buf;