Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 071408b6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] DocBook validation fixes 



More validation fixes as reported by xmllint.

There are still three xmllint errors after this remaining regarding SVG file support.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 34affc6a

Documentation/DocBook/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ $(MEDIA_OBJ_DIR)/media-entities.tmpl: $(MEDIA_OBJ_DIR)/v4l2.xml 
	@(								\

	for ident in $(IOCTLS) ; do					\

	  entity=`echo $$ident | tr _ -` ;				\

	  id=`grep "<refname>$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \

	  id=`grep "<refname>$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml $(MEDIA_OBJ_DIR)/media-ioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \

	  echo "<!ENTITY $$entity \"<link"				\

	    "linkend='$$id'><constant>$$ident</constant></link>\">"	\

	  >>$@ ;							\

Documentation/DocBook/media/dvb/dvbproperty.xml

+11 −11
Original line number Diff line number Diff line
@@ -569,33 +569,33 @@ typedef enum fe_delivery_system { 
			<title><constant>DTV_ATSCMH_RS_FRAME_MODE</constant></title>

			<para>RS frame mode.</para>

			<para>Possible values are:</para>

		  <section id="atscmh-rs-frame-mode">

		  <para id="atscmh-rs-frame-mode">

<programlisting>

typedef enum atscmh_rs_frame_mode {

	ATSCMH_RSFRAME_PRI_ONLY  = 0,

	ATSCMH_RSFRAME_PRI_SEC   = 1,

} atscmh_rs_frame_mode_t;

</programlisting>

		  </section>

		  </para>

		</section>

		<section id="DTV-ATSCMH-RS-FRAME-ENSEMBLE">

			<title><constant>DTV_ATSCMH_RS_FRAME_ENSEMBLE</constant></title>

			<para>RS frame ensemble.</para>

			<para>Possible values are:</para>

		  <section id="atscmh-rs-frame-ensemble">

		  <para id="atscmh-rs-frame-ensemble">

<programlisting>

typedef enum atscmh_rs_frame_ensemble {

	ATSCMH_RSFRAME_ENS_PRI   = 0,

	ATSCMH_RSFRAME_ENS_SEC   = 1,

} atscmh_rs_frame_ensemble_t;

</programlisting>

		  </section>

		  </para>

		</section>

		<section id="DTV-ATSCMH-RS-CODE-MODE-PRI">

			<title><constant>DTV_ATSCMH_RS_CODE_MODE_PRI</constant></title>

			<para>RS code mode (primary).</para>

			<para>Possible values are:</para>

		  <section id="atscmh-rs-code-mode">

		  <para id="atscmh-rs-code-mode">

<programlisting>

typedef enum atscmh_rs_code_mode {

	ATSCMH_RSCODE_211_187    = 0,
@@ -603,7 +603,7 @@ typedef enum atscmh_rs_code_mode { 
	ATSCMH_RSCODE_235_187    = 2,

} atscmh_rs_code_mode_t;

</programlisting>

		  </section>

		  </para>

		</section>

		<section id="DTV-ATSCMH-RS-CODE-MODE-SEC">

			<title><constant>DTV_ATSCMH_RS_CODE_MODE_SEC</constant></title>
@@ -621,27 +621,27 @@ typedef enum atscmh_rs_code_mode { 
			<title><constant>DTV_ATSCMH_SCCC_BLOCK_MODE</constant></title>

			<para>Series Concatenated Convolutional Code Block Mode.</para>

			<para>Possible values are:</para>

		  <section id="atscmh-sccc-block-mode">

		  <para id="atscmh-sccc-block-mode">

<programlisting>

typedef enum atscmh_sccc_block_mode {

	ATSCMH_SCCC_BLK_SEP      = 0,

	ATSCMH_SCCC_BLK_COMB     = 1,

} atscmh_sccc_block_mode_t;

</programlisting>

		  </section>

		  </para>

		</section>

		<section id="DTV-ATSCMH-SCCC-CODE-MODE-A">

			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_A</constant></title>

			<para>Series Concatenated Convolutional Code Rate.</para>

			<para>Possible values are:</para>

		  <section id="atscmh-sccc-code-mode">

		  <para id="atscmh-sccc-code-mode">

<programlisting>

typedef enum atscmh_sccc_code_mode {

	ATSCMH_SCCC_CODE_HLF     = 0,

	ATSCMH_SCCC_CODE_QTR     = 1,

} atscmh_sccc_code_mode_t;

</programlisting>

		  </section>

		  </para>

		</section>

		<section id="DTV-ATSCMH-SCCC-CODE-MODE-B">

			<title><constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant></title>
@@ -817,7 +817,7 @@ typedef enum fe_hierarchy { 
	</section>

	<section id="DTV-INTERLEAVING">

	<title><constant>DTV_INTERLEAVING</constant></title>

	<para>Interleaving mode</para>

	<para id="fe-interleaving">Interleaving mode</para>

	<programlisting>

enum fe_interleaving {

	INTERLEAVING_NONE,

Documentation/DocBook/media/dvb/frontend.xml

+11 −9
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ and to add newer delivery systems.</para> 
<constant>FE_GET_PROPERTY/FE_SET_PROPERTY</constant></link> instead, in

order to be able to support the newer System Delivery like  DVB-S2, DVB-T2,

DVB-C2, ISDB, etc.</para>

<para>All kinds of parameters are combined as an union in the FrontendParameters structure:</para>

<para>All kinds of parameters are combined as an union in the FrontendParameters structure:

<programlisting>

struct dvb_frontend_parameters {

	uint32_t frequency;     /&#x22C6; (absolute) frequency in Hz for QAM/OFDM &#x22C6;/
@@ -277,12 +277,13 @@ struct dvb_frontend_parameters { 
		struct dvb_vsb_parameters  vsb;

	} u;

};

</programlisting>

</programlisting></para>

<para>In the case of QPSK frontends the <constant>frequency</constant> field specifies the intermediate

frequency, i.e. the offset which is effectively added to the local oscillator frequency (LOF) of

the LNB. The intermediate frequency has to be specified in units of kHz. For QAM and

OFDM frontends the <constant>frequency</constant> specifies the absolute frequency and is given in Hz.

</para>



<section id="dvb-qpsk-parameters">

<title>QPSK parameters</title>

<para>For satellite QPSK frontends you have to use the <constant>dvb_qpsk_parameters</constant> structure:</para>
@@ -347,8 +348,8 @@ itself. 
<section id="fe-code-rate-t">

<title>frontend code rate</title>

<para>The possible values for the <constant>fec_inner</constant> field used on

<link refend="dvb-qpsk-parameters"><constant>struct dvb_qpsk_parameters</constant></link> and

<link refend="dvb-qam-parameters"><constant>struct dvb_qam_parameters</constant></link> are:

<link linkend="dvb-qpsk-parameters"><constant>struct dvb_qpsk_parameters</constant></link> and

<link linkend="dvb-qam-parameters"><constant>struct dvb_qam_parameters</constant></link> are:

</para>

<programlisting>

typedef enum fe_code_rate {
@@ -373,9 +374,9 @@ detection. 
<section id="fe-modulation-t">

<title>frontend modulation type for QAM, OFDM and VSB</title>

<para>For cable and terrestrial frontends, e. g. for

<link refend="dvb-qam-parameters"><constant>struct dvb_qpsk_parameters</constant></link>,

<link refend="dvb-ofdm-parameters"><constant>struct dvb_qam_parameters</constant></link> and

<link refend="dvb-vsb-parameters"><constant>struct dvb_qam_parameters</constant></link>,

<link linkend="dvb-qam-parameters"><constant>struct dvb_qpsk_parameters</constant></link>,

<link linkend="dvb-ofdm-parameters"><constant>struct dvb_qam_parameters</constant></link> and

<link linkend="dvb-vsb-parameters"><constant>struct dvb_qam_parameters</constant></link>,

it needs to specify the quadrature modulation mode which can be one of the following:

</para>

<programlisting>
@@ -396,8 +397,8 @@ it needs to specify the quadrature modulation mode which can be one of the follo 
 } fe_modulation_t;

</programlisting>

</section>

<para>Finally, there are several more parameters for OFDM:

</para>

<section>

<title>More OFDM parameters</title>

<section id="fe-transmit-mode-t">

<title>Number of carriers per channel</title>

<programlisting>
@@ -453,6 +454,7 @@ typedef enum fe_hierarchy { 
 } fe_hierarchy_t;

</programlisting>

</section>

</section>



</section>

Documentation/DocBook/media/v4l/controls.xml

+223 −224
Original line number Diff line number Diff line
@@ -3717,9 +3717,6 @@ interface and may change in the future.</para> 
	    use case involving camera or individually.

	  </para>



	</section>



      </section>



          <table pgwide="1" frame="none" id="flash-control-id">

          <title>Flash Control IDs</title>
@@ -3944,6 +3941,8 @@ interface and may change in the future.</para> 
          </tgroup>

          </table>

	</section>

      </section>

    </section>



    <section id="jpeg-controls">

      <title>JPEG Control Reference</title>

Documentation/DocBook/media/v4l/dev-subdev.xml

+10 −10
Original line number Diff line number Diff line
@@ -374,29 +374,29 @@ 
      rectangle --- if it is supported by the hardware.</para>



      <orderedlist>

	<listitem>Sink pad format. The user configures the sink pad

	<listitem><para>Sink pad format. The user configures the sink pad

	format. This format defines the parameters of the image the

	entity receives through the pad for further processing.</listitem>

	entity receives through the pad for further processing.</para></listitem>



	<listitem>Sink pad actual crop selection. The sink pad crop

	defines the crop performed to the sink pad format.</listitem>

	<listitem><para>Sink pad actual crop selection. The sink pad crop

	defines the crop performed to the sink pad format.</para></listitem>



	<listitem>Sink pad actual compose selection. The size of the

	<listitem><para>Sink pad actual compose selection. The size of the

	sink pad compose rectangle defines the scaling ratio compared

	to the size of the sink pad crop rectangle. The location of

	the compose rectangle specifies the location of the actual

	sink compose rectangle in the sink compose bounds

	rectangle.</listitem>

	rectangle.</para></listitem>



	<listitem>Source pad actual crop selection. Crop on the source

	<listitem><para>Source pad actual crop selection. Crop on the source

	pad defines crop performed to the image in the sink compose

	bounds rectangle.</listitem>

	bounds rectangle.</para></listitem>



	<listitem>Source pad format. The source pad format defines the

	<listitem><para>Source pad format. The source pad format defines the

	output pixel format of the subdev, as well as the other

	parameters with the exception of the image width and height.

	Width and height are defined by the size of the source pad

	actual crop selection.</listitem>

	actual crop selection.</para></listitem>

      </orderedlist>



      <para>Accessing any of the above rectangles not supported by the