From 0bd2eaec818bec4b0cbc1d2b8f86c11d59142333 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 18 Jan 2009 16:20:57 +0100 Subject: v4l2-spec: document controls added in 2.6.28. From: Hans Verkuil Priority: normal Signed-off-by: Hans Verkuil --- v4l2-spec/Makefile | 2 -- v4l2-spec/compat.sgml | 9 +++++++++ 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 V4L2_PIX_FMT_Y16 and V4L2_PIX_FMT_SBGGR16 were added. + + Added user controls +V4L2_CID_CHROMA_AGC and +V4L2_CID_COLOR_KILLER. + @@ -2241,6 +2246,10 @@ interface in Linux 2.6.18, where finally removed from the Added V4L2_MPEG_AUDIO_ENCODING_AAC and V4L2_MPEG_AUDIO_ENCODING_AC3 MPEG audio encodings. + + + Added V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC MPEG +video encoding. The pixel formats 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 @@ -261,11 +261,21 @@ picture. Adjusts the backlight compensation in a camera. The minimum value disables backlight compensation. + + V4L2_CID_CHROMA_AGC + boolean + Chroma automatic gain control. + + + V4L2_CID_COLOR_KILLER + boolean + Enable the color killer (&ie; force a black & white image in case of a weak video signal). + V4L2_CID_LASTP1 End of the predefined control IDs (currently -V4L2_CID_BACKLIGHT_COMPENSATION + 1). +V4L2_CID_COLOR_KILLER + 1). V4L2_CID_PRIVATE_BASE @@ -748,19 +758,19 @@ Possible values are: V4L2_MPEG_AUDIO_ENCODING_LAYER_1  - MPEG Layer I encoding + MPEG-1/2 Layer I encoding V4L2_MPEG_AUDIO_ENCODING_LAYER_2  - MPEG Layer II encoding + MPEG-1/2 Layer II encoding V4L2_MPEG_AUDIO_ENCODING_LAYER_3  - MPEG Layer III encoding + MPEG-1/2 Layer III encoding V4L2_MPEG_AUDIO_ENCODING_AAC  - Advance Audio Coding encoding + MPEG-2/4 AAC (Advanced Audio Coding) V4L2_MPEG_AUDIO_ENCODING_AC3  @@ -773,7 +783,7 @@ Possible values are: V4L2_CID_MPEG_AUDIO_L1_BITRATE  enum - Layer I bitrate. + MPEG-1/2 Layer I bitrate. Possible values are: @@ -841,7 +851,7 @@ Possible values are: V4L2_CID_MPEG_AUDIO_L2_BITRATE  enum - Layer II bitrate. + MPEG-1/2 Layer II bitrate. Possible values are: @@ -910,7 +920,7 @@ Possible values are: V4L2_CID_MPEG_AUDIO_L3_BITRATE  enum - Layer III bitrate. + MPEG-1/2 Layer III bitrate. Possible values are: @@ -976,6 +986,12 @@ Possible values are: + + V4L2_CID_MPEG_AUDIO_AAC_BITRATE  + integer + AAC bitrate in bits per second. + + V4L2_CID_MPEG_AUDIO_AC3_BITRATE  enum @@ -1198,6 +1214,10 @@ method. Possible values are: V4L2_MPEG_VIDEO_ENCODING_MPEG_2  MPEG-2 Video encoding + + V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC  + MPEG-4 AVC (H.264) Video encoding + -- cgit v1.2.3