diff options
| -rw-r--r-- | v4l2-spec/Makefile | 2 | ||||
| -rw-r--r-- | v4l2-spec/compat.sgml | 9 | ||||
| -rw-r--r-- | v4l2-spec/controls.sgml | 36 |
3 files changed, 37 insertions, 10 deletions
diff --git a/v4l2-spec/Makefile b/v4l2-spec/Makefile index e7936ade8..7e81936a0 100644 --- a/v4l2-spec/Makefile +++ b/v4l2-spec/Makefile @@ -318,8 +318,6 @@ UNDOCUMENTED = \ v4l2_mpeg_audio_mode_extension \ v4l2_mpeg_audio_sampling_freq \ v4l2_mpeg_audiotype \ - v4l2_mpeg_audiotype \ - v4l2_mpeg_compression \ v4l2_mpeg_compression \ v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type \ v4l2_mpeg_cx2341x_video_luma_spatial_filter_type \ diff --git a/v4l2-spec/compat.sgml b/v4l2-spec/compat.sgml index 161da3161..4f5bf1c8e 100644 --- a/v4l2-spec/compat.sgml +++ b/v4l2-spec/compat.sgml @@ -2211,6 +2211,11 @@ interface in Linux 2.6.18, where finally removed from the <constant>V4L2_PIX_FMT_Y16</constant> and <constant>V4L2_PIX_FMT_SBGGR16</constant> were added.</para> </listitem> + <listitem> + <para>Added user controls +<constant>V4L2_CID_CHROMA_AGC</constant> and +<constant>V4L2_CID_COLOR_KILLER</constant>.</para> + </listitem> </orderedlist> </section> @@ -2243,6 +2248,10 @@ interface in Linux 2.6.18, where finally removed from the <constant>V4L2_MPEG_AUDIO_ENCODING_AC3</constant> MPEG audio encodings.</para> </listitem> <listitem> + <para>Added <constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC</constant> MPEG +video encoding.</para> + </listitem> + <listitem> <para>The pixel formats <constant>V4L2_PIX_FMT_SGRBG10</constant> and <constant>V4L2_PIX_FMT_SGRBG10DPCM8</constant> were added.</para> diff --git a/v4l2-spec/controls.sgml b/v4l2-spec/controls.sgml index 393b9cd7d..9a2982edb 100644 --- a/v4l2-spec/controls.sgml +++ b/v4l2-spec/controls.sgml @@ -262,10 +262,20 @@ picture.</entry> minimum value disables backlight compensation.</entry> </row> <row> + <entry><constant>V4L2_CID_CHROMA_AGC</constant></entry> + <entry>boolean</entry> + <entry>Chroma automatic gain control.</entry> + </row> + <row> + <entry><constant>V4L2_CID_COLOR_KILLER</constant></entry> + <entry>boolean</entry> + <entry>Enable the color killer (&ie; force a black & white image in case of a weak video signal).</entry> + </row> + <row> <entry><constant>V4L2_CID_LASTP1</constant></entry> <entry></entry> <entry>End of the predefined control IDs (currently -<constant>V4L2_CID_BACKLIGHT_COMPENSATION</constant> + 1).</entry> +<constant>V4L2_CID_COLOR_KILLER</constant> + 1).</entry> </row> <row> <entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry> @@ -748,19 +758,19 @@ Possible values are:</entry> <tbody valign="top"> <row> <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_1</constant> </entry> - <entry>MPEG Layer I encoding</entry> + <entry>MPEG-1/2 Layer I encoding</entry> </row> <row> <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_2</constant> </entry> - <entry>MPEG Layer II encoding</entry> + <entry>MPEG-1/2 Layer II encoding</entry> </row> <row> <entry><constant>V4L2_MPEG_AUDIO_ENCODING_LAYER_3</constant> </entry> - <entry>MPEG Layer III encoding</entry> + <entry>MPEG-1/2 Layer III encoding</entry> </row> <row> <entry><constant>V4L2_MPEG_AUDIO_ENCODING_AAC</constant> </entry> - <entry>Advance Audio Coding encoding</entry> + <entry>MPEG-2/4 AAC (Advanced Audio Coding)</entry> </row> <row> <entry><constant>V4L2_MPEG_AUDIO_ENCODING_AC3</constant> </entry> @@ -773,7 +783,7 @@ Possible values are:</entry> <row> <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L1_BITRATE</constant> </entry> <entry>enum</entry> - </row><row><entry spanname="descr">Layer I bitrate. + </row><row><entry spanname="descr">MPEG-1/2 Layer I bitrate. Possible values are:</entry> </row> <row> @@ -841,7 +851,7 @@ Possible values are:</entry> <row> <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L2_BITRATE</constant> </entry> <entry>enum</entry> - </row><row><entry spanname="descr">Layer II bitrate. + </row><row><entry spanname="descr">MPEG-1/2 Layer II bitrate. Possible values are:</entry> </row> <row> @@ -910,7 +920,7 @@ Possible values are:</entry> <row> <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_L3_BITRATE</constant> </entry> <entry>enum</entry> - </row><row><entry spanname="descr">Layer III bitrate. + </row><row><entry spanname="descr">MPEG-1/2 Layer III bitrate. Possible values are:</entry> </row> <row> @@ -977,6 +987,12 @@ Possible values are:</entry> </row> <row><entry></entry></row> <row> + <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_AAC_BITRATE</constant> </entry> + <entry>integer</entry> + </row><row><entry spanname="descr">AAC bitrate in bits per second.</entry> + </row> + <row><entry></entry></row> + <row> <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_AC3_BITRATE</constant> </entry> <entry>enum</entry> </row><row><entry spanname="descr">AC-3 bitrate. @@ -1198,6 +1214,10 @@ method. Possible values are:</entry> <entry><constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_2</constant> </entry> <entry>MPEG-2 Video encoding</entry> </row> + <row> + <entry><constant>V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC</constant> </entry> + <entry>MPEG-4 AVC (H.264) Video encoding</entry> + </row> </tbody> </entrytbl> </row> |