From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:44833 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752071Ab2HMSDC (ORCPT ); Mon, 13 Aug 2012 14:03:02 -0400 Message-ID: <5029414E.7000809@redhat.com> Date: Mon, 13 Aug 2012 15:02:54 -0300 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Hans Verkuil CC: linux-media Subject: Re: [PATCH] DocBook validation fixes References: <201208121402.37719.hverkuil@xs4all.nl> In-Reply-To: <201208121402.37719.hverkuil@xs4all.nl> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em 12-08-2012 09:02, Hans Verkuil escreveu: > More validation fixes as reported by xmllint. > > There are still three xmllint errors remaining after this patch regarding SVG file support. How are you running xmllint? It could be useful to have a make target (if it doesn't have it yet), in order for developers (and for me, when checking patches) to run it. > > Signed-off-by: Hans Verkuil > --- > Documentation/DocBook/media/Makefile | 2 +- > Documentation/DocBook/media/dvb/dvbproperty.xml | 20 +++++++++--------- > Documentation/DocBook/media/dvb/frontend.xml | 20 ++++++++++-------- > Documentation/DocBook/media/v4l/controls.xml | 4 +++- > Documentation/DocBook/media/v4l/dev-subdev.xml | 20 +++++++++--------- > .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 +-- > Documentation/DocBook/media/v4l/selection-api.xml | 22 ++++++++++---------- > .../DocBook/media/v4l/vidioc-g-selection.xml | 9 ++++---- > Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 2 ++ > .../media/v4l/vidioc-subdev-g-selection.xml | 8 +++---- > 10 files changed, 57 insertions(+), 53 deletions(-) > > diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile > index 3625209..9b7e4c5 100644 > --- a/Documentation/DocBook/media/Makefile > +++ b/Documentation/DocBook/media/Makefile > @@ -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 "$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ > + id=`grep "$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml $(MEDIA_OBJ_DIR)/media-ioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ > echo " "linkend='$$id'>$$ident\">" \ > >>$@ ; \ > diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml > index bb4777a..8adab98 100644 > --- a/Documentation/DocBook/media/dvb/dvbproperty.xml > +++ b/Documentation/DocBook/media/dvb/dvbproperty.xml > @@ -567,33 +567,33 @@ typedef enum fe_delivery_system { > <constant>DTV_ATSCMH_RS_FRAME_MODE</constant> > RS frame mode. > Possible values are: > -
> + > > typedef enum atscmh_rs_frame_mode { > ATSCMH_RSFRAME_PRI_ONLY = 0, > ATSCMH_RSFRAME_PRI_SEC = 1, > } atscmh_rs_frame_mode_t; > > -
> + > >
> <constant>DTV_ATSCMH_RS_FRAME_ENSEMBLE</constant> > RS frame ensemble. > Possible values are: > -
> + > > typedef enum atscmh_rs_frame_ensemble { > ATSCMH_RSFRAME_ENS_PRI = 0, > ATSCMH_RSFRAME_ENS_SEC = 1, > } atscmh_rs_frame_ensemble_t; > > -
> + >
>
> <constant>DTV_ATSCMH_RS_CODE_MODE_PRI</constant> > RS code mode (primary). > Possible values are: > -
> + > > typedef enum atscmh_rs_code_mode { > ATSCMH_RSCODE_211_187 = 0, > @@ -601,7 +601,7 @@ typedef enum atscmh_rs_code_mode { > ATSCMH_RSCODE_235_187 = 2, > } atscmh_rs_code_mode_t; > > -
> + >
>
> <constant>DTV_ATSCMH_RS_CODE_MODE_SEC</constant> > @@ -619,27 +619,27 @@ typedef enum atscmh_rs_code_mode { > <constant>DTV_ATSCMH_SCCC_BLOCK_MODE</constant> > Series Concatenated Convolutional Code Block Mode. > Possible values are: > -
> + > > typedef enum atscmh_sccc_block_mode { > ATSCMH_SCCC_BLK_SEP = 0, > ATSCMH_SCCC_BLK_COMB = 1, > } atscmh_sccc_block_mode_t; > > -
> + >
>
> <constant>DTV_ATSCMH_SCCC_CODE_MODE_A</constant> > Series Concatenated Convolutional Code Rate. > Possible values are: > -
> + > > typedef enum atscmh_sccc_code_mode { > ATSCMH_SCCC_CODE_HLF = 0, > ATSCMH_SCCC_CODE_QTR = 1, > } atscmh_sccc_code_mode_t; > > -
> + >
>
> <constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant> > diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml > index 81082fb..418f197 100644 > --- a/Documentation/DocBook/media/dvb/frontend.xml > +++ b/Documentation/DocBook/media/dvb/frontend.xml > @@ -238,7 +238,7 @@ and to add newer delivery systems. > FE_GET_PROPERTY/FE_SET_PROPERTY instead, in > order to be able to support the newer System Delivery like DVB-S2, DVB-T2, > DVB-C2, ISDB, etc. > -All kinds of parameters are combined as an union in the FrontendParameters structure: > +All kinds of parameters are combined as an union in the FrontendParameters structure: > > struct dvb_frontend_parameters { > uint32_t frequency; /⋆ (absolute) frequency in Hz for QAM/OFDM ⋆/ > @@ -251,12 +251,13 @@ struct dvb_frontend_parameters { > struct dvb_vsb_parameters vsb; > } u; > }; > - > + > In the case of QPSK frontends the frequency 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 frequency specifies the absolute frequency and is given in Hz. > > + >
> QPSK parameters > For satellite QPSK frontends you have to use the dvb_qpsk_parameters structure: > @@ -321,8 +322,8 @@ itself. >
> frontend code rate > The possible values for the fec_inner field used on > -struct dvb_qpsk_parameters and > -struct dvb_qam_parameters are: > +struct dvb_qpsk_parameters and > +struct dvb_qam_parameters are: > > > typedef enum fe_code_rate { > @@ -347,9 +348,9 @@ detection. >
> frontend modulation type for QAM, OFDM and VSB > For cable and terrestrial frontends, e. g. for > -struct dvb_qpsk_parameters, > -struct dvb_qam_parameters and > -struct dvb_qam_parameters, > +struct dvb_qpsk_parameters, > +struct dvb_qam_parameters and > +struct dvb_qam_parameters, > it needs to specify the quadrature modulation mode which can be one of the following: > > > @@ -370,8 +371,8 @@ it needs to specify the quadrature modulation mode which can be one of the follo > } fe_modulation_t; > >
> -Finally, there are several more parameters for OFDM: > - > +
> +More OFDM parameters >
> Number of carriers per channel > > @@ -427,6 +428,7 @@ typedef enum fe_hierarchy { > } fe_hierarchy_t; > >
> +
> >
> > diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml > index b0964fb..a5f9a7f 100644 > --- a/Documentation/DocBook/media/v4l/controls.xml > +++ b/Documentation/DocBook/media/v4l/controls.xml > @@ -3721,6 +3721,8 @@ interface and may change in the future. > >
> > +
> + > Hmm... empty title here, with just one table? That looked weird, and could be creating some harm at the section indexe. > Flash Control IDs > > @@ -3942,7 +3944,7 @@ interface and may change in the future. > > > > -
> +
>
> >
> diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml b/Documentation/DocBook/media/v4l/dev-subdev.xml > index a3d9dd0..d15aaf8 100644 > --- a/Documentation/DocBook/media/v4l/dev-subdev.xml > +++ b/Documentation/DocBook/media/v4l/dev-subdev.xml > @@ -374,29 +374,29 @@ > rectangle --- if it is supported by the hardware. > > > - Sink pad format. The user configures the sink pad > + 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. > + entity receives through the pad for further processing. > > - Sink pad actual crop selection. The sink pad crop > - defines the crop performed to the sink pad format. > + Sink pad actual crop selection. The sink pad crop > + defines the crop performed to the sink pad format. > > - Sink pad actual compose selection. The size of the > + 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. > + rectangle. > > - Source pad actual crop selection. Crop on the source > + Source pad actual crop selection. Crop on the source > pad defines crop performed to the image in the sink compose > - bounds rectangle. > + bounds rectangle. > > - Source pad format. The source pad format defines the > + 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. > + actual crop selection. > > > Accessing any of the above rectangles not supported by the > diff --git a/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml b/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml > index 8eace3e..2d3f0b1a 100644 > --- a/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml > +++ b/Documentation/DocBook/media/v4l/pixfmt-srggb10dpcm8.xml > @@ -22,8 +22,7 @@ > with 10 bits per colour compressed to 8 bits each, using DPCM > compression. DPCM, differential pulse-code modulation, is lossy. > Each colour component consumes 8 bits of memory. In other respects > - this format is similar to - linkend="pixfmt-srggb10">. > + this format is similar to . > > > > diff --git a/Documentation/DocBook/media/v4l/selection-api.xml b/Documentation/DocBook/media/v4l/selection-api.xml > index e7ed507..4c238ce 100644 > --- a/Documentation/DocBook/media/v4l/selection-api.xml > +++ b/Documentation/DocBook/media/v4l/selection-api.xml > @@ -40,6 +40,7 @@ cropping and composing rectangles have the same size. >
> Selection targets > > + >
> Cropping and composing targets > > @@ -52,12 +53,12 @@ cropping and composing rectangles have the same size. > > >
> + > > + See for more > + information. >
> > - See for more > - information. > - >
> > Configuration > @@ -216,18 +217,17 @@ composing and cropping operations by setting the appropriate targets. The V4L2 > API lacks any support for composing to and cropping from an image inside a > memory buffer. The application could configure a capture device to fill only a > part of an image by abusing V4L2 API. Cropping a smaller image from a larger > -one is achieved by setting the field > -&v4l2-pix-format;::bytesperline . Introducing an image offsets > -could be done by modifying field &v4l2-buffer;::m:userptr > - before calling VIDIOC_QBUF . Those > +one is achieved by setting the field > +&v4l2-pix-format;::bytesperline. Introducing an image offsets > +could be done by modifying field &v4l2-buffer;::m_userptr > +before calling VIDIOC_QBUF . Those > operations should be avoided because they are not portable (endianness), and do > not work for macroblock and Bayer formats and mmap buffers. The selection API > deals with configuration of buffer cropping/composing in a clear, intuitive and > portable way. Next, with the selection API the concepts of the padded target > -and constraints flags are introduced. Finally, &v4l2-crop; > - and &v4l2-cropcap; have no reserved > -fields. Therefore there is no way to extend their functionality. The new > - &v4l2-selection; provides a lot of place for future > +and constraints flags are introduced. Finally, &v4l2-crop; and &v4l2-cropcap; > +have no reserved fields. Therefore there is no way to extend their functionality. > +The new &v4l2-selection; provides a lot of place for future > extensions. Driver developers are encouraged to implement only selection API. > The former cropping API would be simulated using the new one. > > diff --git a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml > index f76d8a6..b11ec75 100644 > --- a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml > +++ b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml > @@ -152,12 +152,10 @@ satisfactory parameters have been negotiated. If constraints flags have to be > violated at then ERANGE is returned. The error indicates that there > exist no rectangle that satisfies the constraints. > > - > - > Selection targets and flags are documented in linkend="v4l2-selections-common"/>. > > -
> + >
> Size adjustments with constraint flags. > > @@ -170,9 +168,9 @@ exist no rectangle that satisfies the constraints. > > >
> -
> + > > - > + > > struct <structname>v4l2_selection</structname> > > @@ -208,6 +206,7 @@ exist no rectangle that satisfies the constraints. > > >
> + > > > > diff --git a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml > index 77ff5be..6a821a6 100644 > --- a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml > +++ b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml > @@ -155,6 +155,8 @@ or no buffers have been allocated yet, or the > userptr or > length are invalid. > > + > + > EIO > > VIDIOC_DQBUF failed due to an > diff --git a/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml > index f33cc81..1ba9e99 100644 > --- a/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml > +++ b/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml > @@ -69,23 +69,22 @@ > more information on how each selection target affects the image > processing pipeline inside the subdevice. > > -
> + > Types of selection targets > > There are two types of selection targets: actual and bounds. The > actual targets are the targets which configure the hardware. The BOUNDS > target will return a rectangle that contain all possible actual > rectangles. > -
> + > > -
> + > Discovering supported features > > To discover which targets are supported, the user can > perform VIDIOC_SUBDEV_G_SELECTION on them. > Any unsupported target will return > EINVAL. > -
> > Selection targets and flags are documented in linkend="v4l2-selections-common"/>. > @@ -132,6 +131,7 @@ > > > > + > > > >