[PATCH] V4L: JPEG class documentation corrections

[PATCH] V4L: JPEG class documentation corrections

[Sylwester Nawrocki]

This patch fixes following compilation warning:
Error: no ID for constraint linkend: v4l2-jpeg-chroma-subsampling.

and adds missing JPEG control class at the Table A.58.

Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
 Documentation/DocBook/media/v4l/controls.xml       |    2 +-
 .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 582324f..8761e76 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3546,7 +3546,7 @@ interface and may change in the future.</para>
 	    from RGB to Y'CbCr color space.
 	    </entry>
 	  </row>
-	  <row>
+	  <row id = "v4l2-jpeg-chroma-subsampling">
 	    <entrytbl spanname="descr" cols="2">
 	      <tbody valign="top">
 		<row>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
index b17a7aa..27e20bc 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
@@ -265,7 +265,13 @@ These controls are described in <xref
 These controls are described in <xref
 		linkend="flash-controls" />.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
+	    <entry>0x9d0000</entry>
+	    <entry>The class containing JPEG compression controls.
+These controls are described in <xref
+		linkend="jpeg-controls" />.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>
--
1.7.4.1

[PATCH v2] V4L: JPEG class documentation corrections

[Sylwester Nawrocki]

From: Sylwester Nawrocki <s.nawrocki@samsung.com>

This patch fixes following compilation warning:
Error: no ID for constraint linkend: v4l2-jpeg-chroma-subsampling.

and adds missing JPEG control class at the Table A.58.

Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
---
Changes since v1:
 - jpeg-chroma-subsampling-control replaced with v4l2-jpeg-chroma-subsampling
   rather than adding new id

 Documentation/DocBook/media/v4l/controls.xml       |    2 +-
 .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index b84f25e..aa1fb7f 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3476,7 +3476,7 @@ interface and may change in the future.</para>
 	    <entry spanname="id"><constant>V4L2_CID_JPEG_CHROMA_SUBSAMPLING</constant></entry>
 	    <entry>menu</entry>
 	  </row>
-	  <row id="jpeg-chroma-subsampling-control">
+	  <row id="v4l2-jpeg-chroma-subsampling">
 	    <entry spanname="descr">The chroma subsampling factors describe how
 	    each component of an input image is sampled, in respect to maximum
 	    sample rate in each spatial dimension. See <xref linkend="itu-t81"/>,
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
index b17a7aa..27e20bc 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
@@ -265,6 +265,13 @@ These controls are described in <xref
 These controls are described in <xref
 		linkend="flash-controls" />.</entry>
 	  </row>
+	  <row>
+	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
+	    <entry>0x9d0000</entry>
+	    <entry>The class containing JPEG compression controls.
+These controls are described in <xref
+		linkend="jpeg-controls" />.</entry>
+	  </row>
 	</tbody>
       </tgroup>
     </table>
--
1.7.4.1

Re: [PATCH] V4L: JPEG class documentation corrections

[Sylwester Nawrocki]

Hi Mauro,

I noticed that this patch and V2 that was only intended for merging,
are both in media tree now:

http://git.linuxtv.org/media_tree.git/history/579e92ffac65c717c9c8a50feb755a035a51bb3f:/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

As a result Table A.58 has a redundant V4L2_CTRL_CLASS_JPEG entry:

...
V4L2_CTRL_CLASS_FLASH	0x9c0000	The class containing flash device controls. These controls are described in the section called “Flash Control Reference”.
V4L2_CTRL_CLASS_JPEG	0x9d0000	The class containing JPEG compression controls. These controls are described in the section called “JPEG Control Reference”.
V4L2_CTRL_CLASS_IMAGE_SOURCE	0x9e0000	The class containing image source controls. These controls are described in the section called “Image Source Control Reference”.
V4L2_CTRL_CLASS_IMAGE_PROC	0x9f0000	The class containing image processing controls. These controls are described in the section called “Image Process Control Reference”.
V4L2_CTRL_CLASS_JPEG	0x9d0000	The class containing JPEG compression controls. These controls are described in the section called “JPEG Control Reference”.

Thus I would suggest to revert the older patch - feed0258e11e04b7e0d2df8ae3793ab5d302a035
and remove redundant entry from the end of table.

Regards,
Sylwester

On 03/31/2012 11:43 AM, Sylwester Nawrocki wrote:
> This patch fixes following compilation warning:
> Error: no ID for constraint linkend: v4l2-jpeg-chroma-subsampling.
> 
> and adds missing JPEG control class at the Table A.58.
> 
> Signed-off-by: Sylwester Nawrocki<sylvester.nawrocki@gmail.com>
> ---
>   Documentation/DocBook/media/v4l/controls.xml       |    2 +-
>   .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 +++++++
>   2 files changed, 8 insertions(+), 1 deletions(-)
> 
> diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
> index 582324f..8761e76 100644
> --- a/Documentation/DocBook/media/v4l/controls.xml
> +++ b/Documentation/DocBook/media/v4l/controls.xml
> @@ -3546,7 +3546,7 @@ interface and may change in the future.</para>
>   	from RGB to Y'CbCr color space.
>   	</entry>
>   	</row>
> -	<row>
> +	<row id = "v4l2-jpeg-chroma-subsampling">
>   	<entrytbl spanname="descr" cols="2">
>   	<tbody valign="top">
>   		<row>
> diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
> index b17a7aa..27e20bc 100644
> --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
> +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
> @@ -265,7 +265,13 @@ These controls are described in<xref
>   These controls are described in<xref
>   		linkend="flash-controls" />.</entry>
>   	</row>
> +	<row>
> +	<entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
> +	<entry>0x9d0000</entry>
> +	<entry>The class containing JPEG compression controls.
> +These controls are described in<xref
> +		linkend="jpeg-controls" />.</entry>
> +	</row>
>   	</tbody>
>         </tgroup>
>       </table>
> --
> 1.7.4.1
>