[vlc-devel] Re: [Patch] better support for more recent pvr: drivers
Jean-Paul Saman
jean-paul.saman at planet.nl
Tue Mar 27 09:52:59 CEST 2007
Paul Corke wrote:
> [Re-sent as the original didn't show up on the list]
>
> This patch adds better support for more recent ivtv drivers. If it
> detects driver 0.8.0 then it uses the v4l2 ioctls to set up bitrate
> and audio settings. For older drivers, it keeps using the old ones.
>
> This means that a commandline like:
>
> vlc pvr:/dev/video0:size=720x576:bitrate=6000000:maxbitrate=6000000
>
> will honour the bitrate and maxbitrate settings; previously with
> newer ivtv driver it would just use the card defaults.
>
> The videodev2.h file is copied from the ivtv sources.
Please don't do that, just create a check for videodev2.h in
configure.ac when pvr is selected.
> Obviously it would be better to do the v4l2 support work, but this
> might keep some people happy in the meantime. I've tried to keep to
> the coding standard but please let me know if there are any other
> changes needed.
I found some minor improvements for readibility. See the code below. For
the rest it looks OK to me, but perhaps the original author can comment
also?
> Regards,
>
> Paul.
>
>
> ------------------------------------------------------------------------
>
> Index: modules/access/pvr.c
> ===================================================================
> --- modules/access/pvr.c (revision 19371)
> +++ modules/access/pvr.c (working copy)
> @@ -5,6 +5,7 @@
> * $Id$
> *
> * Authors: Eric Petit <titer at videolan.org>
> + * Paul Corke <paulc at datatote.co.uk>
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License as published by
> @@ -205,9 +206,283 @@
> int i_audio_bitmask;
> int i_input;
> int i_volume;
> +
> + /* driver version */
> + vlc_bool_t b_v4l2_api;
> };
>
> /*****************************************************************************
> + * ConfigureIVTV: set up codec parameters using the old ivtv api
> + *****************************************************************************/
> +static void ConfigureIVTV( access_t * p_access, access_sys_t * p_sys )
> +{
> + struct ivtv_ioctl_codec codec;
> +
> + if( ioctl( p_sys->i_fd, IVTV_IOC_G_CODEC, &codec ) < 0 )
> + {
> + msg_Warn( p_access, "IVTV_IOC_G_CODEC failed" );
> + }
> + else
> + {
> + if( p_sys->i_framerate != -1 )
> + {
> + switch( p_sys->i_framerate )
> + {
> + case 30:
> + codec.framerate = 0;
> + break;
> +
> + case 25:
> + codec.framerate = 1;
> + break;
> +
> + default:
> + msg_Warn( p_access, "invalid framerate, reverting to 25" );
> + codec.framerate = 1;
> + break;
> + }
> + }
> +
> + if( p_sys->i_bitrate != -1 )
> + {
> + codec.bitrate = p_sys->i_bitrate;
> + }
> +
> + if( p_sys->i_bitrate_peak != -1 )
> + {
> + codec.bitrate_peak = p_sys->i_bitrate_peak;
> + }
> +
> + if( p_sys->i_bitrate_mode != -1 )
> + {
> + codec.bitrate_mode = p_sys->i_bitrate_mode;
> + }
> +
> + if( p_sys->i_audio_bitmask != -1 )
> + {
> + codec.audio_bitmask = p_sys->i_audio_bitmask;
> + }
> +
> + if( p_sys->i_keyint != -1 )
> + {
> + codec.framespergop = p_sys->i_keyint;
> + }
> +
> + if( p_sys->i_bframes != -1 )
> + {
> + codec.bframes = p_sys->i_bframes;
> + }
> +
> + if( ioctl( p_sys->i_fd, IVTV_IOC_S_CODEC, &codec ) < 0 )
> + {
> + msg_Warn( p_access, "IVTV_IOC_S_CODEC failed" );
> + }
> + else
> + {
> + msg_Dbg( p_access, "Setting codec parameters to: framerate: %d, bitrate: %d/%d/%d",
> + codec.framerate, codec.bitrate, codec.bitrate_peak, codec.bitrate_mode );
> + }
> + }
> +}
> +
> +#define MAX_V4L2_CTRLS (6)
> +/*****************************************************************************
> + * AddV4L2Ctrl: adds a control to the v4l2 controls list
> + *****************************************************************************/
> +static void AddV4L2Ctrl( access_t * p_access, struct v4l2_ext_controls * p_controls, uint32_t i_id, uint32_t i_value )
> +{
> + if( p_controls->count < MAX_V4L2_CTRLS )
> + {
> + p_controls->controls[p_controls->count].id = i_id;
> + p_controls->controls[p_controls->count].value = i_value;
> + ++p_controls->count;
I prefer:
p_controls->count++;
> + }
> + else
> + {
> + msg_Err( p_access, "Tried to set too many v4l2 controls." );
> + }
> +}
> +
> +/*****************************************************************************
> + * V4L2SampleRate: calculate v4l2 sample rate from pvr-audio-bitmask
> + *****************************************************************************/
> +static uint32_t V4L2SampleRate( uint32_t i_bitmask )
> +{
> + switch( i_bitmask & 0x0003 )
> + {
> + case 0x0001: return V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;
> + case 0x0002: return V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000;
> + }
Make it more readible:
switch( i_bitmask & 0x0003 )
{
case 0x0001:
return V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;
case 0x0002:
return V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000;
}
> + return V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100;
> +}
> +
> +/*****************************************************************************
> + * V4L2AudioEncoding: calculate v4l2 audio encoding level from pvr-audio-bitmask
> + *****************************************************************************/
> +static uint32_t V4L2AudioEncoding( uint32_t i_bitmask )
> +{
> + switch( i_bitmask & 0x000c )
> + {
> + case 0x0004: return V4L2_MPEG_AUDIO_ENCODING_LAYER_1;
> + case 0x0008: return V4L2_MPEG_AUDIO_ENCODING_LAYER_2;
> + }
Same here ^^^^
> + return 0xffffffff;
> +}
> +
> +/*****************************************************************************
> + * V4L2AudioL1Bitrate: calculate v4l2 audio bitrate for layer-1 audio from pvr-audio-bitmask
> + *****************************************************************************/
> +static uint32_t V4L2AudioL1Bitrate( uint32_t i_bitmask )
> +{
> + switch( i_bitmask & 0x00f0 )
> + {
> + case 0x0010: return V4L2_MPEG_AUDIO_L1_BITRATE_32K;
> + case 0x0020: return V4L2_MPEG_AUDIO_L1_BITRATE_64K;
> + case 0x0030: return V4L2_MPEG_AUDIO_L1_BITRATE_96K;
> + case 0x0040: return V4L2_MPEG_AUDIO_L1_BITRATE_128K;
> + case 0x0050: return V4L2_MPEG_AUDIO_L1_BITRATE_160K;
> + case 0x0060: return V4L2_MPEG_AUDIO_L1_BITRATE_192K;
> + case 0x0070: return V4L2_MPEG_AUDIO_L1_BITRATE_224K;
> + case 0x0080: return V4L2_MPEG_AUDIO_L1_BITRATE_256K;
> + case 0x0090: return V4L2_MPEG_AUDIO_L1_BITRATE_288K;
> + case 0x00a0: return V4L2_MPEG_AUDIO_L1_BITRATE_320K;
> + case 0x00b0: return V4L2_MPEG_AUDIO_L1_BITRATE_352K;
> + case 0x00c0: return V4L2_MPEG_AUDIO_L1_BITRATE_384K;
> + case 0x00d0: return V4L2_MPEG_AUDIO_L1_BITRATE_416K;
> + case 0x00e0: return V4L2_MPEG_AUDIO_L1_BITRATE_448K;
> + }
Same here ^^^^
> + return V4L2_MPEG_AUDIO_L1_BITRATE_320K;
> +}
> +
> +/*****************************************************************************
> + * V4L2AudioL2Bitrate: calculate v4l2 audio bitrate for layer-1 audio from pvr-audio-bitmask
> + *****************************************************************************/
> +static uint32_t V4L2AudioL2Bitrate( uint32_t i_bitmask )
> +{
> + switch( i_bitmask & 0x00f0 )
> + {
> + case 0x0010: return V4L2_MPEG_AUDIO_L2_BITRATE_32K;
> + case 0x0020: return V4L2_MPEG_AUDIO_L2_BITRATE_48K;
> + case 0x0030: return V4L2_MPEG_AUDIO_L2_BITRATE_56K;
> + case 0x0040: return V4L2_MPEG_AUDIO_L2_BITRATE_64K;
> + case 0x0050: return V4L2_MPEG_AUDIO_L2_BITRATE_80K;
> + case 0x0060: return V4L2_MPEG_AUDIO_L2_BITRATE_96K;
> + case 0x0070: return V4L2_MPEG_AUDIO_L2_BITRATE_112K;
> + case 0x0080: return V4L2_MPEG_AUDIO_L2_BITRATE_128K;
> + case 0x0090: return V4L2_MPEG_AUDIO_L2_BITRATE_160K;
> + case 0x00a0: return V4L2_MPEG_AUDIO_L2_BITRATE_192K;
> + case 0x00b0: return V4L2_MPEG_AUDIO_L2_BITRATE_224K;
> + case 0x00c0: return V4L2_MPEG_AUDIO_L2_BITRATE_256K;
> + case 0x00d0: return V4L2_MPEG_AUDIO_L2_BITRATE_320K;
> + case 0x00e0: return V4L2_MPEG_AUDIO_L2_BITRATE_384K;
> + }
> + return V4L2_MPEG_AUDIO_L2_BITRATE_192K;
Same here ^^^^
> +}
> +
> +/*****************************************************************************
> + * V4L2AudioMode: calculate v4l2 audio mode from pvr-audio-bitmask
> + *****************************************************************************/
> +static uint32_t V4L2AudioMode( uint32_t i_bitmask )
> +{
> + switch( i_bitmask & 0x0300 )
> + {
> + case 0x0100: return V4L2_MPEG_AUDIO_MODE_JOINT_STEREO;
> + case 0x0200: return V4L2_MPEG_AUDIO_MODE_DUAL;
> + case 0x0300: return V4L2_MPEG_AUDIO_MODE_MONO;
> + }
Same here ^^^^
> + return V4L2_MPEG_AUDIO_MODE_STEREO;
> +}
> +
> +/*****************************************************************************
> + * ConfigureV4L2: set up codec parameters using the new v4l2 api
> + *****************************************************************************/
> +static void ConfigureV4L2( access_t * p_access, access_sys_t * p_sys )
> +{
> + struct v4l2_ext_controls controls;
> +
> + controls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
> + controls.error_idx = 0;
> + controls.reserved[0] = 0;
> + controls.reserved[1] = 0;
> + controls.count = 0;
> + controls.controls = calloc( sizeof( struct v4l2_ext_control ), MAX_V4L2_CTRLS );
> +
> + /* Note: Ignore frame rate. Doesn't look like it can be changed. */
> +
> + if( p_sys->i_bitrate != -1 )
> + {
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE, p_sys->i_bitrate );
> + msg_Dbg( p_access, "Setting [%u] bitrate = %u", controls.count - 1, p_sys->i_bitrate );
> + }
> +
> + if( p_sys->i_bitrate_peak != -1 )
> + {
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK, p_sys->i_bitrate_peak );
> + msg_Dbg( p_access, "Setting [%u] bitrate_peak = %u", controls.count - 1, p_sys->i_bitrate_peak );
> + }
> +
> + if( p_sys->i_bitrate_mode != -1 )
> + {
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE_MODE, p_sys->i_bitrate_mode );
> + msg_Dbg( p_access, "Setting [%u] bitrate_mode = %u", controls.count - 1, p_sys->i_bitrate_mode );
> + }
> +
> + if( p_sys->i_audio_bitmask != -1 )
> + {
> + /* Sample rate */
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, V4L2SampleRate( p_sys->i_audio_bitmask ) );
> +
> + /* Encoding layer and bitrate */
> + switch( V4L2AudioEncoding( p_sys->i_audio_bitmask ) )
> + {
> + case V4L2_MPEG_AUDIO_ENCODING_LAYER_1:
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, V4L2_MPEG_AUDIO_ENCODING_LAYER_1 );
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_L1_BITRATE, V4L2AudioL1Bitrate( p_sys->i_audio_bitmask ) );
> + break;
> +
> + case V4L2_MPEG_AUDIO_ENCODING_LAYER_2:
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, V4L2_MPEG_AUDIO_ENCODING_LAYER_2 );
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_L2_BITRATE, V4L2AudioL2Bitrate( p_sys->i_audio_bitmask ) );
> + break;
> + }
> +
> + /* Audio mode - stereo or mono */
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_MODE, V4L2AudioMode( p_sys->i_audio_bitmask ) );
> +
> + /* See if the user wants any other audio feature */
> + if( ( p_sys->i_audio_bitmask & 0x1ff00 ) != 0 )
> + {
> + /* It would be possible to support the bits that represent:
> + * V4L2_CID_MPEG_AUDIO_MODE_EXTENSION
> + * V4L2_CID_MPEG_AUDIO_EMPHASIS
> + * V4L2_CID_MPEG_AUDIO_CRC
> + * but they are not currently used. Tell the user.
> + */
> + msg_Err( p_access, "There were bits in pvr-audio-bitmask that we did not use");
> + }
> +
> + msg_Dbg( p_access, "Setting audio controls");
> + }
> +
> + if( p_sys->i_keyint != -1 )
> + {
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_GOP_SIZE, p_sys->i_keyint );
> + msg_Dbg( p_access, "Setting [%u] keyint = %u", controls.count - 1, p_sys->i_keyint );
> + }
> +
> + if( p_sys->i_bframes != -1 )
> + {
> + AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_B_FRAMES, p_sys->i_bframes );
> + msg_Dbg( p_access, "Setting [%u] bframes = %u", controls.count - 1, p_sys->i_bframes );
> + }
> +
> + if( ioctl( p_sys->i_fd, VIDIOC_S_EXT_CTRLS, &controls ) < 0 )
> + {
> + msg_Warn( p_access, "VIDIOC_S_EXT_CTRLS failed on control number %u", controls.error_idx );
> + }
> +}
> +
> +/*****************************************************************************
> * Open: open the device
> *****************************************************************************/
> static int Open( vlc_object_t * p_this )
> @@ -216,6 +491,7 @@
> access_sys_t * p_sys;
> char * psz_tofree, * psz_parser, * psz_device, * psz_radio_device;
> vlc_value_t val;
> + struct v4l2_capability device_capability;
>
> //psz_device = calloc( strlen( "/dev/videox" ) + 1, 1 );
>
> @@ -497,6 +773,31 @@
>
> free( psz_device );
>
> + /* See what version of ivtvdriver is running */
> + if( ioctl( p_sys->i_fd, VIDIOC_QUERYCAP, &device_capability ) < 0 )
> + {
> + msg_Err( p_access, "VIDIOC_QUERYCAP failed" );
> + free( p_sys );
> + return VLC_EGENERIC;
> + }
> + else
> + {
> + msg_Dbg( p_access, "ivtv driver version %02x.%02x.%02x",
> + ( device_capability.version >> 16 ) & 0xff,
> + ( device_capability.version >> 8 ) & 0xff,
> + ( device_capability.version ) & 0xff);
> + if ( device_capability.version >= 0x000800 )
> + {
> + /* Drivers > 0.8.0 use v4l2 API instead of IVTV ioctls */
> + msg_Dbg( p_access, "this driver uses the v4l2 API" );
> + p_sys->b_v4l2_api = VLC_TRUE;
> + }
> + else
> + {
> + p_sys->b_v4l2_api = VLC_FALSE;
> + }
> + }
> +
> /* set the input */
> if ( p_sys->i_input != -1 )
> {
> @@ -647,70 +948,13 @@
> || p_sys->i_bitrate != -1
> || p_sys->i_audio_bitmask != -1 )
> {
> - struct ivtv_ioctl_codec codec;
> -
> - if ( ioctl( p_sys->i_fd, IVTV_IOC_G_CODEC, &codec ) < 0 )
> + if( p_sys->b_v4l2_api )
> {
> - msg_Warn( p_access, "IVTV_IOC_G_CODEC failed" );
> + ConfigureV4L2( p_access, p_sys );
> }
> else
> {
> - if ( p_sys->i_framerate != -1 )
> - {
> - switch ( p_sys->i_framerate )
> - {
> - case 30:
> - codec.framerate = 0;
> - break;
> -
> - case 25:
> - codec.framerate = 1;
> - break;
> -
> - default:
> - msg_Warn( p_access, "invalid framerate, reverting to 25" );
> - codec.framerate = 1;
> - break;
> - }
> - }
> -
> - if ( p_sys->i_bitrate != -1 )
> - {
> - codec.bitrate = p_sys->i_bitrate;
> - }
> -
> - if ( p_sys->i_bitrate_peak != -1 )
> - {
> - codec.bitrate_peak = p_sys->i_bitrate_peak;
> - }
> -
> - if ( p_sys->i_bitrate_mode != -1 )
> - {
> - codec.bitrate_mode = p_sys->i_bitrate_mode;
> - }
> -
> - if ( p_sys->i_audio_bitmask != -1 )
> - {
> - codec.audio_bitmask = p_sys->i_audio_bitmask;
> - }
> - if ( p_sys->i_keyint != -1 )
> - {
> - codec.framespergop = p_sys->i_keyint;
> - }
> -
> - if ( p_sys->i_bframes != -1 )
> - {
> - codec.bframes = p_sys->i_bframes;
> - }
> - if( ioctl( p_sys->i_fd, IVTV_IOC_S_CODEC, &codec ) < 0 )
> - {
> - msg_Warn( p_access, "IVTV_IOC_S_CODEC failed" );
> - }
> - else
> - {
> - msg_Dbg( p_access, "Setting codec parameters to: framerate: %d, bitrate: %d/%d/%d",
> - codec.framerate, codec.bitrate, codec.bitrate_peak, codec.bitrate_mode );
> - }
> + ConfigureIVTV( p_access, p_sys );
> }
> }
>
>
>
> ------------------------------------------------------------------------
>
> Index: modules/access/videodev2.h
> ===================================================================
> --- modules/access/videodev2.h (revision 19371)
> +++ modules/access/videodev2.h (working copy)
> @@ -1,26 +1,55 @@
> -#ifndef __LINUX_VIDEODEV2_H
> -#define __LINUX_VIDEODEV2_H
> /*
> * Video for Linux Two
> *
> - * Header file for v4l or V4L2 drivers and applications, for
> - * Linux kernels 2.2.x or 2.4.x.
> + * Header file for v4l or V4L2 drivers and applications
> + * with public API.
> + * All kernel-specific stuff were moved to media/v4l2-dev.h, so
> + * no #if __KERNEL tests are allowed here
> *
> - * See http://bytesex.org/v4l/ for API specs and other
> - * v4l2 documentation.
> + * See http://linuxtv.org for more info
> *
> * Author: Bill Dirks <bdirks at pacbell.net>
> * Justin Schoeman
> * et al.
> */
> +#ifndef __LINUX_VIDEODEV2_H
> +#define __LINUX_VIDEODEV2_H
> +#ifdef __KERNEL__
> +#include <linux/time.h> /* need struct timeval */
> +#include <linux/compiler.h> /* need __user */
> +#else
> +#define __user
> +#endif
> +#include <linux/types.h>
>
> /*
> + * Common stuff for both V4L1 and V4L2
> + * Moved from videodev.h
> + */
> +#define VIDEO_MAX_FRAME 32
> +
> +#define VID_TYPE_CAPTURE 1 /* Can capture */
> +#define VID_TYPE_TUNER 2 /* Can tune */
> +#define VID_TYPE_TELETEXT 4 /* Does teletext */
> +#define VID_TYPE_OVERLAY 8 /* Overlay onto frame buffer */
> +#define VID_TYPE_CHROMAKEY 16 /* Overlay by chromakey */
> +#define VID_TYPE_CLIPPING 32 /* Can clip */
> +#define VID_TYPE_FRAMERAM 64 /* Uses the frame buffer memory */
> +#define VID_TYPE_SCALES 128 /* Scalable */
> +#define VID_TYPE_MONOCHROME 256 /* Monochrome only */
> +#define VID_TYPE_SUBCAPTURE 512 /* Can capture subareas of the image */
> +#define VID_TYPE_MPEG_DECODER 1024 /* Can decode MPEG streams */
> +#define VID_TYPE_MPEG_ENCODER 2048 /* Can encode MPEG streams */
> +#define VID_TYPE_MJPEG_DECODER 4096 /* Can decode MJPEG streams */
> +#define VID_TYPE_MJPEG_ENCODER 8192 /* Can encode MJPEG streams */
> +
> +/*
> * M I S C E L L A N E O U S
> */
>
> /* Four-character-code (FOURCC) */
> #define v4l2_fourcc(a,b,c,d)\
> - (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
> + (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
>
> /*
> * E N U M S
> @@ -56,12 +85,17 @@
> (field) == V4L2_FIELD_SEQ_BT)
>
> enum v4l2_buf_type {
> - V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,
> - V4L2_BUF_TYPE_VIDEO_OUTPUT = 2,
> - V4L2_BUF_TYPE_VIDEO_OVERLAY = 3,
> - V4L2_BUF_TYPE_VBI_CAPTURE = 4,
> - V4L2_BUF_TYPE_VBI_OUTPUT = 5,
> - V4L2_BUF_TYPE_PRIVATE = 0x80,
> + V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,
> + V4L2_BUF_TYPE_VIDEO_OUTPUT = 2,
> + V4L2_BUF_TYPE_VIDEO_OVERLAY = 3,
> + V4L2_BUF_TYPE_VBI_CAPTURE = 4,
> + V4L2_BUF_TYPE_VBI_OUTPUT = 5,
> +#if 1
> + /* Experimental Sliced VBI */
> + V4L2_BUF_TYPE_SLICED_VBI_CAPTURE = 6,
> + V4L2_BUF_TYPE_SLICED_VBI_OUTPUT = 7,
> +#endif
> + V4L2_BUF_TYPE_PRIVATE = 0x80,
> };
>
> enum v4l2_ctrl_type {
> @@ -69,11 +103,14 @@
> V4L2_CTRL_TYPE_BOOLEAN = 2,
> V4L2_CTRL_TYPE_MENU = 3,
> V4L2_CTRL_TYPE_BUTTON = 4,
> + V4L2_CTRL_TYPE_INTEGER64 = 5,
> + V4L2_CTRL_TYPE_CTRL_CLASS = 6,
> };
>
> enum v4l2_tuner_type {
> V4L2_TUNER_RADIO = 1,
> V4L2_TUNER_ANALOG_TV = 2,
> + V4L2_TUNER_DIGITAL_TV = 3,
> };
>
> enum v4l2_memory {
> @@ -92,24 +129,32 @@
>
> /* HD and modern captures. */
> V4L2_COLORSPACE_REC709 = 3,
> -
> +
> /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
> V4L2_COLORSPACE_BT878 = 4,
> -
> +
> /* These should be useful. Assume 601 extents. */
> V4L2_COLORSPACE_470_SYSTEM_M = 5,
> V4L2_COLORSPACE_470_SYSTEM_BG = 6,
> -
> +
> /* I know there will be cameras that send this. So, this is
> * unspecified chromaticities and full 0-255 on each of the
> * Y'CbCr components
> */
> V4L2_COLORSPACE_JPEG = 7,
> -
> +
> /* For RGB colourspaces, this is probably a good start. */
> V4L2_COLORSPACE_SRGB = 8,
> };
>
> +enum v4l2_priority {
> + V4L2_PRIORITY_UNSET = 0, /* not initialized */
> + V4L2_PRIORITY_BACKGROUND = 1,
> + V4L2_PRIORITY_INTERACTIVE = 2,
> + V4L2_PRIORITY_RECORD = 3,
> + V4L2_PRIORITY_DEFAULT = V4L2_PRIORITY_INTERACTIVE,
> +};
> +
> struct v4l2_rect {
> __s32 left;
> __s32 top;
> @@ -129,44 +174,48 @@
> {
> __u8 driver[16]; /* i.e. "bttv" */
> __u8 card[32]; /* i.e. "Hauppauge WinTV" */
> - __u8 bus_info[32]; /* "PCI:" + pci_dev->slot_name */
> + __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */
> __u32 version; /* should use KERNEL_VERSION() */
> __u32 capabilities; /* Device capabilities */
> __u32 reserved[4];
> };
>
> /* Values for 'capabilities' field */
> -#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */
> -#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */
> -#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */
> -#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a VBI capture device */
> -#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a VBI output device */
> -#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */
> +#define V4L2_CAP_VIDEO_CAPTURE 0x00000001 /* Is a video capture device */
> +#define V4L2_CAP_VIDEO_OUTPUT 0x00000002 /* Is a video output device */
> +#define V4L2_CAP_VIDEO_OVERLAY 0x00000004 /* Can do video overlay */
> +#define V4L2_CAP_VBI_CAPTURE 0x00000010 /* Is a raw VBI capture device */
> +#define V4L2_CAP_VBI_OUTPUT 0x00000020 /* Is a raw VBI output device */
> +#if 1
> +#define V4L2_CAP_SLICED_VBI_CAPTURE 0x00000040 /* Is a sliced VBI capture device */
> +#define V4L2_CAP_SLICED_VBI_OUTPUT 0x00000080 /* Is a sliced VBI output device */
> +#endif
> +#define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */
>
> -#define V4L2_CAP_TUNER 0x00010000 /* Has a tuner */
> -#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */
> +#define V4L2_CAP_TUNER 0x00010000 /* has a tuner */
> +#define V4L2_CAP_AUDIO 0x00020000 /* has audio support */
> +#define V4L2_CAP_RADIO 0x00040000 /* is a radio device */
>
> -#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */
> -#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */
> -#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */
> +#define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */
> +#define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */
> +#define V4L2_CAP_STREAMING 0x04000000 /* streaming I/O ioctls */
>
> /*
> * V I D E O I M A G E F O R M A T
> */
> -
> struct v4l2_pix_format
> {
> - __u32 width;
> - __u32 height;
> - __u32 pixelformat;
> + __u32 width;
> + __u32 height;
> + __u32 pixelformat;
> enum v4l2_field field;
> __u32 bytesperline; /* for padding, zero if unused */
> - __u32 sizeimage;
> - enum v4l2_colorspace colorspace;
> + __u32 sizeimage;
> + enum v4l2_colorspace colorspace;
> __u32 priv; /* private data, depends on pixelformat */
> };
>
> -/* Pixel format FOURCC depth Description */
> +/* Pixel format FOURCC depth Description */
> #define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */
> #define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */
> #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */
> @@ -194,33 +243,116 @@
> #define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y','U','1','2') /* 12 YUV 4:2:0 */
> #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y','Y','U','V') /* 16 YUV 4:2:2 */
> #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H','I','2','4') /* 8 8-bit color */
> +#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H','M','1','2') /* 8 YUV 4:2:0 16x16 macroblocks */
>
> +/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
> +#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */
> +
> /* compressed formats */
> #define V4L2_PIX_FMT_MJPEG v4l2_fourcc('M','J','P','G') /* Motion-JPEG */
> #define V4L2_PIX_FMT_JPEG v4l2_fourcc('J','P','E','G') /* JFIF JPEG */
> #define V4L2_PIX_FMT_DV v4l2_fourcc('d','v','s','d') /* 1394 */
> -#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') /* MPEG */
> +#define V4L2_PIX_FMT_MPEG v4l2_fourcc('M','P','E','G') /* MPEG-1/2/4 */
>
> /* Vendor-specific formats */
> -#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compres */
> +#define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compress */
> +#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */
> +#define V4L2_PIX_FMT_PWC1 v4l2_fourcc('P','W','C','1') /* pwc older webcam */
> +#define V4L2_PIX_FMT_PWC2 v4l2_fourcc('P','W','C','2') /* pwc newer webcam */
> +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */
>
> /*
> * F O R M A T E N U M E R A T I O N
> */
> struct v4l2_fmtdesc
> {
> - __u32 index; /* Format number */
> + __u32 index; /* Format number */
> enum v4l2_buf_type type; /* buffer type */
> __u32 flags;
> - __u8 description[32]; /* Description string */
> - __u32 pixelformat; /* Format fourcc */
> - __u32 reserved[4];
> + __u8 description[32]; /* Description string */
> + __u32 pixelformat; /* Format fourcc */
> + __u32 reserved[4];
> };
>
> #define V4L2_FMT_FLAG_COMPRESSED 0x0001
>
> +#if 1
> + /* Experimental Frame Size and frame rate enumeration */
> +/*
> + * F R A M E S I Z E E N U M E R A T I O N
> + */
> +enum v4l2_frmsizetypes
> +{
> + V4L2_FRMSIZE_TYPE_DISCRETE = 1,
> + V4L2_FRMSIZE_TYPE_CONTINUOUS = 2,
> + V4L2_FRMSIZE_TYPE_STEPWISE = 3,
> +};
>
> +struct v4l2_frmsize_discrete
> +{
> + __u32 width; /* Frame width [pixel] */
> + __u32 height; /* Frame height [pixel] */
> +};
> +
> +struct v4l2_frmsize_stepwise
> +{
> + __u32 min_width; /* Minimum frame width [pixel] */
> + __u32 max_width; /* Maximum frame width [pixel] */
> + __u32 step_width; /* Frame width step size [pixel] */
> + __u32 min_height; /* Minimum frame height [pixel] */
> + __u32 max_height; /* Maximum frame height [pixel] */
> + __u32 step_height; /* Frame height step size [pixel] */
> +};
> +
> +struct v4l2_frmsizeenum
> +{
> + __u32 index; /* Frame size number */
> + __u32 pixel_format; /* Pixel format */
> + __u32 type; /* Frame size type the device supports. */
> +
> + union { /* Frame size */
> + struct v4l2_frmsize_discrete discrete;
> + struct v4l2_frmsize_stepwise stepwise;
> + };
> +
> + __u32 reserved[2]; /* Reserved space for future use */
> +};
> +
> /*
> + * F R A M E R A T E E N U M E R A T I O N
> + */
> +enum v4l2_frmivaltypes
> +{
> + V4L2_FRMIVAL_TYPE_DISCRETE = 1,
> + V4L2_FRMIVAL_TYPE_CONTINUOUS = 2,
> + V4L2_FRMIVAL_TYPE_STEPWISE = 3,
> +};
> +
> +struct v4l2_frmival_stepwise
> +{
> + struct v4l2_fract min; /* Minimum frame interval [s] */
> + struct v4l2_fract max; /* Maximum frame interval [s] */
> + struct v4l2_fract step; /* Frame interval step size [s] */
> +};
> +
> +struct v4l2_frmivalenum
> +{
> + __u32 index; /* Frame format index */
> + __u32 pixel_format; /* Pixel format */
> + __u32 width; /* Frame width */
> + __u32 height; /* Frame height */
> + __u32 type; /* Frame interval type the device supports. */
> +
> + union { /* Frame interval */
> + struct v4l2_fract discrete;
> + struct v4l2_frmival_stepwise stepwise;
> + };
> +
> + __u32 reserved[2]; /* Reserved space for future use */
> +};
> +#endif
> +
> +/*
> * T I M E C O D E
> */
> struct v4l2_timecode
> @@ -249,21 +381,92 @@
> #define V4L2_TC_USERBITS_8BITCHARS 0x0008
> /* The above is based on SMPTE timecodes */
>
> -
> +#ifdef __KERNEL__
> /*
> - * C O M P R E S S I O N P A R A M E T E R S
> + * M P E G C O M P R E S S I O N P A R A M E T E R S
> + *
> + * ### WARNING: This experimental MPEG compression API is obsolete.
> + * ### It is replaced by the MPEG controls API.
> + * ### This old API will disappear in the near future!
> + *
> */
> -#if 0
> -/* ### generic compression settings don't work, there is too much
> - * ### codec-specific stuff. Maybe reuse that for MPEG codec settings
> - * ### later ... */
> -struct v4l2_compression
> -{
> - __u32 quality;
> - __u32 keyframerate;
> - __u32 pframerate;
> - __u32 reserved[5];
> +enum v4l2_bitrate_mode {
> + V4L2_BITRATE_NONE = 0, /* not specified */
> + V4L2_BITRATE_CBR, /* constant bitrate */
> + V4L2_BITRATE_VBR, /* variable bitrate */
> };
> +struct v4l2_bitrate {
> + /* rates are specified in kbit/sec */
> + enum v4l2_bitrate_mode mode;
> + __u32 min;
> + __u32 target; /* use this one for CBR */
> + __u32 max;
> +};
> +
> +enum v4l2_mpeg_streamtype {
> + V4L2_MPEG_SS_1, /* MPEG-1 system stream */
> + V4L2_MPEG_PS_2, /* MPEG-2 program stream */
> + V4L2_MPEG_TS_2, /* MPEG-2 transport stream */
> + V4L2_MPEG_PS_DVD, /* MPEG-2 program stream with DVD header fixups */
> +};
> +enum v4l2_mpeg_audiotype {
> + V4L2_MPEG_AU_2_I, /* MPEG-2 layer 1 */
> + V4L2_MPEG_AU_2_II, /* MPEG-2 layer 2 */
> + V4L2_MPEG_AU_2_III, /* MPEG-2 layer 3 */
> + V4L2_MPEG_AC3, /* AC3 */
> + V4L2_MPEG_LPCM, /* LPCM */
> +};
> +enum v4l2_mpeg_videotype {
> + V4L2_MPEG_VI_1, /* MPEG-1 */
> + V4L2_MPEG_VI_2, /* MPEG-2 */
> +};
> +enum v4l2_mpeg_aspectratio {
> + V4L2_MPEG_ASPECT_SQUARE = 1, /* square pixel */
> + V4L2_MPEG_ASPECT_4_3 = 2, /* 4 : 3 */
> + V4L2_MPEG_ASPECT_16_9 = 3, /* 16 : 9 */
> + V4L2_MPEG_ASPECT_1_221 = 4, /* 1 : 2,21 */
> +};
> +
> +struct v4l2_mpeg_compression {
> + /* general */
> + enum v4l2_mpeg_streamtype st_type;
> + struct v4l2_bitrate st_bitrate;
> +
> + /* transport streams */
> + __u16 ts_pid_pmt;
> + __u16 ts_pid_audio;
> + __u16 ts_pid_video;
> + __u16 ts_pid_pcr;
> +
> + /* program stream */
> + __u16 ps_size;
> + __u16 reserved_1; /* align */
> +
> + /* audio */
> + enum v4l2_mpeg_audiotype au_type;
> + struct v4l2_bitrate au_bitrate;
> + __u32 au_sample_rate;
> + __u8 au_pesid;
> + __u8 reserved_2[3]; /* align */
> +
> + /* video */
> + enum v4l2_mpeg_videotype vi_type;
> + enum v4l2_mpeg_aspectratio vi_aspect_ratio;
> + struct v4l2_bitrate vi_bitrate;
> + __u32 vi_frame_rate;
> + __u16 vi_frames_per_gop;
> + __u16 vi_bframes_count;
> + __u8 vi_pesid;
> + __u8 reserved_3[3]; /* align */
> +
> + /* misc flags */
> + __u32 closed_gops:1;
> + __u32 pulldown:1;
> + __u32 reserved_4:30; /* align */
> +
> + /* I don't expect the above being perfect yet ;) */
> + __u32 reserved_5[8];
> +};
> #endif
>
> struct v4l2_jpegcompression
> @@ -274,10 +477,10 @@
> * must be 0..15 */
> int APP_len; /* Length of data in JPEG APPn segment */
> char APP_data[60]; /* Data in the JPEG APPn segment. */
> -
> +
> int COM_len; /* Length of data in JPEG COM segment */
> char COM_data[60]; /* Data in JPEG COM segment */
> -
> +
> __u32 jpeg_markers; /* Which markers should go into the JPEG
> * output. Unless you exactly know what
> * you do, leave them untouched.
> @@ -287,25 +490,24 @@
> * The presence of the APP and COM marker
> * is influenced by APP_len and COM_len
> * ONLY, not by this property! */
> -
> +
> #define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */
> #define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */
> #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */
> #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */
> #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will
> - * allways use APP0 */
> + * allways use APP0 */
> };
>
> -
> /*
> * M E M O R Y - M A P P I N G B U F F E R S
> */
> struct v4l2_requestbuffers
> {
> - __u32 count;
> + __u32 count;
> enum v4l2_buf_type type;
> enum v4l2_memory memory;
> - __u32 reserved[2];
> + __u32 reserved[2];
> };
>
> struct v4l2_buffer
> @@ -326,8 +528,8 @@
> unsigned long userptr;
> } m;
> __u32 length;
> -
> - __u32 reserved[2];
> + __u32 input;
> + __u32 reserved;
> };
>
> /* Flags for 'flags' field */
> @@ -338,6 +540,7 @@
> #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */
> #define V4L2_BUF_FLAG_BFRAME 0x0020 /* Image is a B-frame */
> #define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */
> +#define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */
>
> /*
> * O V E R L A Y P R E V I E W
> @@ -364,7 +567,7 @@
> struct v4l2_clip
> {
> struct v4l2_rect c;
> - struct v4l2_clip *next;
> + struct v4l2_clip __user *next;
> };
>
> struct v4l2_window
> @@ -372,12 +575,11 @@
> struct v4l2_rect w;
> enum v4l2_field field;
> __u32 chromakey;
> - struct v4l2_clip *clips;
> + struct v4l2_clip __user *clips;
> __u32 clipcount;
> - void *bitmap;
> + void __user *bitmap;
> };
>
> -
> /*
> * C A P T U R E P A R A M E T E R S
> */
> @@ -390,6 +592,7 @@
> __u32 readbuffers; /* # of buffers for read */
> __u32 reserved[4];
> };
> +
> /* Flags for 'capability' and 'capturemode' fields */
> #define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */
> #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
> @@ -407,12 +610,11 @@
> /*
> * I N P U T I M A G E C R O P P I N G
> */
> -
> struct v4l2_cropcap {
> - enum v4l2_buf_type type;
> - struct v4l2_rect bounds;
> - struct v4l2_rect defrect;
> - struct v4l2_fract pixelaspect;
> + enum v4l2_buf_type type;
> + struct v4l2_rect bounds;
> + struct v4l2_rect defrect;
> + struct v4l2_fract pixelaspect;
> };
>
> struct v4l2_crop {
> @@ -443,6 +645,8 @@
>
> #define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000)
> #define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000)
> +#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000)
> +#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000)
>
> #define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000)
> #define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000)
> @@ -451,11 +655,18 @@
> #define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000)
> #define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000)
> #define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000)
> +#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000)
>
> /* ATSC/HDTV */
> #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000)
> #define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000)
>
> +/* some merged standards */
> +#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
> +#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
> +#define V4L2_STD_GH (V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
> +#define V4L2_STD_DK (V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
> +
> /* some common needed stuff */
> #define V4L2_STD_PAL_BG (V4L2_STD_PAL_B |\
> V4L2_STD_PAL_B1 |\
> @@ -468,22 +679,28 @@
> V4L2_STD_PAL_H |\
> V4L2_STD_PAL_I)
> #define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\
> - V4L2_STD_NTSC_M_JP)
> + V4L2_STD_NTSC_M_JP |\
> + V4L2_STD_NTSC_M_KR)
> +#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\
> + V4L2_STD_SECAM_K |\
> + V4L2_STD_SECAM_K1)
> #define V4L2_STD_SECAM (V4L2_STD_SECAM_B |\
> - V4L2_STD_SECAM_D |\
> V4L2_STD_SECAM_G |\
> V4L2_STD_SECAM_H |\
> - V4L2_STD_SECAM_K |\
> - V4L2_STD_SECAM_K1 |\
> - V4L2_STD_SECAM_L)
> + V4L2_STD_SECAM_DK |\
> + V4L2_STD_SECAM_L |\
> + V4L2_STD_SECAM_LC)
>
> #define V4L2_STD_525_60 (V4L2_STD_PAL_M |\
> V4L2_STD_PAL_60 |\
> - V4L2_STD_NTSC)
> + V4L2_STD_NTSC |\
> + V4L2_STD_NTSC_443)
> #define V4L2_STD_625_50 (V4L2_STD_PAL |\
> V4L2_STD_PAL_N |\
> V4L2_STD_PAL_Nc |\
> V4L2_STD_SECAM)
> +#define V4L2_STD_ATSC (V4L2_STD_ATSC_8_VSB |\
> + V4L2_STD_ATSC_16_VSB)
>
> #define V4L2_STD_UNKNOWN 0
> #define V4L2_STD_ALL (V4L2_STD_525_60 |\
> @@ -491,7 +708,7 @@
>
> struct v4l2_standard
> {
> - __u32 index;
> + __u32 index;
> v4l2_std_id id;
> __u8 name[24];
> struct v4l2_fract frameperiod; /* Frames, not fields */
> @@ -499,21 +716,21 @@
> __u32 reserved[4];
> };
>
> -
> /*
> * V I D E O I N P U T S
> */
> struct v4l2_input
> {
> __u32 index; /* Which input */
> - __u8 name[32]; /* Label */
> + __u8 name[32]; /* Label */
> __u32 type; /* Type of input */
> - __u32 audioset; /* Associated audios (bitfield) */
> + __u32 audioset; /* Associated audios (bitfield) */
> __u32 tuner; /* Associated tuner */
> v4l2_std_id std;
> __u32 status;
> __u32 reserved[4];
> };
> +
> /* Values for the 'type' field */
> #define V4L2_INPUT_TYPE_TUNER 1
> #define V4L2_INPUT_TYPE_CAMERA 2
> @@ -543,9 +760,9 @@
> struct v4l2_output
> {
> __u32 index; /* Which output */
> - __u8 name[32]; /* Label */
> + __u8 name[32]; /* Label */
> __u32 type; /* Type of output */
> - __u32 audioset; /* Associated audios (bitfield) */
> + __u32 audioset; /* Associated audios (bitfield) */
> __u32 modulator; /* Associated modulator */
> v4l2_std_id std;
> __u32 reserved[4];
> @@ -564,15 +781,43 @@
> __s32 value;
> };
>
> +struct v4l2_ext_control
> +{
> + __u32 id;
> + __u32 reserved2[2];
> + union {
> + __s32 value;
> + __s64 value64;
> + void *reserved;
> + };
> +} __attribute__ ((packed));
> +
> +struct v4l2_ext_controls
> +{
> + __u32 ctrl_class;
> + __u32 count;
> + __u32 error_idx;
> + __u32 reserved[2];
> + struct v4l2_ext_control *controls;
> +};
> +
> +/* Values for ctrl_class field */
> +#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
> +#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
> +
> +#define V4L2_CTRL_ID_MASK (0x0fffffff)
> +#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)
> +#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
> +
> /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
> struct v4l2_queryctrl
> {
> - __u32 id;
> + __u32 id;
> enum v4l2_ctrl_type type;
> __u8 name[32]; /* Whatever */
> __s32 minimum; /* Note signedness */
> __s32 maximum;
> - __s32 step;
> + __s32 step;
> __s32 default_value;
> __u32 flags;
> __u32 reserved[2];
> @@ -590,12 +835,21 @@
> /* Control flags */
> #define V4L2_CTRL_FLAG_DISABLED 0x0001
> #define V4L2_CTRL_FLAG_GRABBED 0x0002
> +#define V4L2_CTRL_FLAG_READ_ONLY 0x0004
> +#define V4L2_CTRL_FLAG_UPDATE 0x0008
> +#define V4L2_CTRL_FLAG_INACTIVE 0x0010
> +#define V4L2_CTRL_FLAG_SLIDER 0x0020
>
> -/* Control IDs defined by V4L2 */
> -#define V4L2_CID_BASE 0x00980900
> +/* Query flag, to be ORed with the control ID */
> +#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000
> +
> +/* User-class control IDs defined by V4L2 */
> +#define V4L2_CID_BASE (V4L2_CTRL_CLASS_USER | 0x900)
> +#define V4L2_CID_USER_BASE V4L2_CID_BASE
> /* IDs reserved for driver specific controls */
> #define V4L2_CID_PRIVATE_BASE 0x08000000
>
> +#define V4L2_CID_USER_CLASS (V4L2_CTRL_CLASS_USER | 1)
> #define V4L2_CID_BRIGHTNESS (V4L2_CID_BASE+0)
> #define V4L2_CID_CONTRAST (V4L2_CID_BASE+1)
> #define V4L2_CID_SATURATION (V4L2_CID_BASE+2)
> @@ -622,6 +876,188 @@
> #define V4L2_CID_VCENTER (V4L2_CID_BASE+23)
> #define V4L2_CID_LASTP1 (V4L2_CID_BASE+24) /* last CID + 1 */
>
> +/* MPEG-class control IDs defined by V4L2 */
> +#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
> +#define V4L2_CID_MPEG_CLASS (V4L2_CTRL_CLASS_MPEG | 1)
> +
> +/* MPEG streams */
> +#define V4L2_CID_MPEG_STREAM_TYPE (V4L2_CID_MPEG_BASE+0)
> +enum v4l2_mpeg_stream_type {
> + V4L2_MPEG_STREAM_TYPE_MPEG2_PS = 0, /* MPEG-2 program stream */
> + V4L2_MPEG_STREAM_TYPE_MPEG2_TS = 1, /* MPEG-2 transport stream */
> + V4L2_MPEG_STREAM_TYPE_MPEG1_SS = 2, /* MPEG-1 system stream */
> + V4L2_MPEG_STREAM_TYPE_MPEG2_DVD = 3, /* MPEG-2 DVD-compatible stream */
> + V4L2_MPEG_STREAM_TYPE_MPEG1_VCD = 4, /* MPEG-1 VCD-compatible stream */
> + V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
> +};
> +#define V4L2_CID_MPEG_STREAM_PID_PMT (V4L2_CID_MPEG_BASE+1)
> +#define V4L2_CID_MPEG_STREAM_PID_AUDIO (V4L2_CID_MPEG_BASE+2)
> +#define V4L2_CID_MPEG_STREAM_PID_VIDEO (V4L2_CID_MPEG_BASE+3)
> +#define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4)
> +#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5)
> +#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6)
> +#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7)
> +enum v4l2_mpeg_stream_vbi_fmt {
> + V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */
> + V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */
> +};
> +
> +/* MPEG audio */
> +#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100)
> +enum v4l2_mpeg_audio_sampling_freq {
> + V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
> + V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
> + V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
> +};
> +#define V4L2_CID_MPEG_AUDIO_ENCODING (V4L2_CID_MPEG_BASE+101)
> +enum v4l2_mpeg_audio_encoding {
> + V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
> + V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
> + V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
> +};
> +#define V4L2_CID_MPEG_AUDIO_L1_BITRATE (V4L2_CID_MPEG_BASE+102)
> +enum v4l2_mpeg_audio_l1_bitrate {
> + V4L2_MPEG_AUDIO_L1_BITRATE_32K = 0,
> + V4L2_MPEG_AUDIO_L1_BITRATE_64K = 1,
> + V4L2_MPEG_AUDIO_L1_BITRATE_96K = 2,
> + V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
> + V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
> + V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
> + V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
> + V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
> + V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
> + V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
> + V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
> + V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
> + V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
> + V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
> +};
> +#define V4L2_CID_MPEG_AUDIO_L2_BITRATE (V4L2_CID_MPEG_BASE+103)
> +enum v4l2_mpeg_audio_l2_bitrate {
> + V4L2_MPEG_AUDIO_L2_BITRATE_32K = 0,
> + V4L2_MPEG_AUDIO_L2_BITRATE_48K = 1,
> + V4L2_MPEG_AUDIO_L2_BITRATE_56K = 2,
> + V4L2_MPEG_AUDIO_L2_BITRATE_64K = 3,
> + V4L2_MPEG_AUDIO_L2_BITRATE_80K = 4,
> + V4L2_MPEG_AUDIO_L2_BITRATE_96K = 5,
> + V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
> + V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
> + V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
> + V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
> + V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
> + V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
> + V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
> + V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
> +};
> +#define V4L2_CID_MPEG_AUDIO_L3_BITRATE (V4L2_CID_MPEG_BASE+104)
> +enum v4l2_mpeg_audio_l3_bitrate {
> + V4L2_MPEG_AUDIO_L3_BITRATE_32K = 0,
> + V4L2_MPEG_AUDIO_L3_BITRATE_40K = 1,
> + V4L2_MPEG_AUDIO_L3_BITRATE_48K = 2,
> + V4L2_MPEG_AUDIO_L3_BITRATE_56K = 3,
> + V4L2_MPEG_AUDIO_L3_BITRATE_64K = 4,
> + V4L2_MPEG_AUDIO_L3_BITRATE_80K = 5,
> + V4L2_MPEG_AUDIO_L3_BITRATE_96K = 6,
> + V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
> + V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
> + V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
> + V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
> + V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
> + V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
> + V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
> +};
> +#define V4L2_CID_MPEG_AUDIO_MODE (V4L2_CID_MPEG_BASE+105)
> +enum v4l2_mpeg_audio_mode {
> + V4L2_MPEG_AUDIO_MODE_STEREO = 0,
> + V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
> + V4L2_MPEG_AUDIO_MODE_DUAL = 2,
> + V4L2_MPEG_AUDIO_MODE_MONO = 3,
> +};
> +#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (V4L2_CID_MPEG_BASE+106)
> +enum v4l2_mpeg_audio_mode_extension {
> + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4 = 0,
> + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8 = 1,
> + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
> + V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
> +};
> +#define V4L2_CID_MPEG_AUDIO_EMPHASIS (V4L2_CID_MPEG_BASE+107)
> +enum v4l2_mpeg_audio_emphasis {
> + V4L2_MPEG_AUDIO_EMPHASIS_NONE = 0,
> + V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
> + V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17 = 2,
> +};
> +#define V4L2_CID_MPEG_AUDIO_CRC (V4L2_CID_MPEG_BASE+108)
> +enum v4l2_mpeg_audio_crc {
> + V4L2_MPEG_AUDIO_CRC_NONE = 0,
> + V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
> +};
> +
> +/* MPEG video */
> +#define V4L2_CID_MPEG_VIDEO_ENCODING (V4L2_CID_MPEG_BASE+200)
> +enum v4l2_mpeg_video_encoding {
> + V4L2_MPEG_VIDEO_ENCODING_MPEG_1 = 0,
> + V4L2_MPEG_VIDEO_ENCODING_MPEG_2 = 1,
> +};
> +#define V4L2_CID_MPEG_VIDEO_ASPECT (V4L2_CID_MPEG_BASE+201)
> +enum v4l2_mpeg_video_aspect {
> + V4L2_MPEG_VIDEO_ASPECT_1x1 = 0,
> + V4L2_MPEG_VIDEO_ASPECT_4x3 = 1,
> + V4L2_MPEG_VIDEO_ASPECT_16x9 = 2,
> + V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
> +};
> +#define V4L2_CID_MPEG_VIDEO_B_FRAMES (V4L2_CID_MPEG_BASE+202)
> +#define V4L2_CID_MPEG_VIDEO_GOP_SIZE (V4L2_CID_MPEG_BASE+203)
> +#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE (V4L2_CID_MPEG_BASE+204)
> +#define V4L2_CID_MPEG_VIDEO_PULLDOWN (V4L2_CID_MPEG_BASE+205)
> +#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE (V4L2_CID_MPEG_BASE+206)
> +enum v4l2_mpeg_video_bitrate_mode {
> + V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
> + V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
> +};
> +#define V4L2_CID_MPEG_VIDEO_BITRATE (V4L2_CID_MPEG_BASE+207)
> +#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK (V4L2_CID_MPEG_BASE+208)
> +#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
> +
> +/* MPEG-class control IDs specific to the CX2584x driver as defined by V4L2 */
> +#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG | 0x1000)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0)
> +enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
> + V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
> + V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO = 1,
> +};
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+1)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+2)
> +enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
> + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF = 0,
> + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
> + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT = 2,
> + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE = 3,
> + V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
> +};
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+3)
> +enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
> + V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF = 0,
> + V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
> +};
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+4)
> +enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
> + V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
> + V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO = 1,
> +};
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER (V4L2_CID_MPEG_CX2341X_BASE+5)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE (V4L2_CID_MPEG_CX2341X_BASE+6)
> +enum v4l2_mpeg_cx2341x_video_median_filter_type {
> + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF = 0,
> + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR = 1,
> + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT = 2,
> + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
> + V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG = 4,
> +};
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+7)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+8)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
> +#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP (V4L2_CID_MPEG_CX2341X_BASE+10)
> +
> /*
> * T U N I N G
> */
> @@ -672,13 +1108,14 @@
> #define V4L2_TUNER_MODE_LANG2 0x0002
> #define V4L2_TUNER_MODE_SAP 0x0002
> #define V4L2_TUNER_MODE_LANG1 0x0003
> +#define V4L2_TUNER_MODE_LANG1_LANG2 0x0004
>
> struct v4l2_frequency
> {
> - __u32 tuner;
> + __u32 tuner;
> enum v4l2_tuner_type type;
> - __u32 frequency;
> - __u32 reserved[8];
> + __u32 frequency;
> + __u32 reserved[8];
> };
>
> /*
> @@ -692,6 +1129,7 @@
> __u32 mode;
> __u32 reserved[2];
> };
> +
> /* Flags for the 'capability' field */
> #define V4L2_AUDCAP_STEREO 0x00001
> #define V4L2_AUDCAP_AVL 0x00002
> @@ -714,6 +1152,7 @@
> * Data services API by Michael Schimek
> */
>
> +/* Raw VBI */
> struct v4l2_vbi_format
> {
> __u32 sampling_rate; /* in 1 Hz */
> @@ -730,7 +1169,62 @@
> #define V4L2_VBI_UNSYNC (1<< 0)
> #define V4L2_VBI_INTERLACED (1<< 1)
>
> +#if 1
> +/* Sliced VBI
> + *
> + * This implements is a proposal V4L2 API to allow SLICED VBI
> + * required for some hardware encoders. It should change without
> + * notice in the definitive implementation.
> + */
>
> +struct v4l2_sliced_vbi_format
> +{
> + __u16 service_set;
> + /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
> + service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
> + (equals frame lines 313-336 for 625 line video
> + standards, 263-286 for 525 line standards) */
> + __u16 service_lines[2][24];
> + __u32 io_size;
> + __u32 reserved[2]; /* must be zero */
> +};
> +
> +/* Teletext World System Teletext
> + (WST), defined on ITU-R BT.653-2 */
> +#define V4L2_SLICED_TELETEXT_B (0x0001)
> +/* Video Program System, defined on ETS 300 231*/
> +#define V4L2_SLICED_VPS (0x0400)
> +/* Closed Caption, defined on EIA-608 */
> +#define V4L2_SLICED_CAPTION_525 (0x1000)
> +/* Wide Screen System, defined on ITU-R BT1119.1 */
> +#define V4L2_SLICED_WSS_625 (0x4000)
> +
> +#define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525)
> +#define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
> +
> +
> +struct v4l2_sliced_vbi_cap
> +{
> + __u16 service_set;
> + /* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
> + service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
> + (equals frame lines 313-336 for 625 line video
> + standards, 263-286 for 525 line standards) */
> + __u16 service_lines[2][24];
> + enum v4l2_buf_type type;
> + __u32 reserved[3]; /* must be 0 */
> +};
> +
> +struct v4l2_sliced_vbi_data
> +{
> + __u32 id;
> + __u32 field; /* 0: first field, 1: second field */
> + __u32 line; /* 1-23 */
> + __u32 reserved; /* must be 0 */
> + __u8 data[48];
> +};
> +#endif
> +
> /*
> * A G G R E G A T E S T R U C T U R E S
> */
> @@ -742,10 +1236,13 @@
> enum v4l2_buf_type type;
> union
> {
> - struct v4l2_pix_format pix; // V4L2_BUF_TYPE_VIDEO_CAPTURE
> - struct v4l2_window win; // V4L2_BUF_TYPE_VIDEO_OVERLAY
> - struct v4l2_vbi_format vbi; // V4L2_BUF_TYPE_VBI_CAPTURE
> - __u8 raw_data[200]; // user-defined
> + struct v4l2_pix_format pix; // V4L2_BUF_TYPE_VIDEO_CAPTURE
> + struct v4l2_window win; // V4L2_BUF_TYPE_VIDEO_OVERLAY
> + struct v4l2_vbi_format vbi; // V4L2_BUF_TYPE_VBI_CAPTURE
> +#if 1
> + struct v4l2_sliced_vbi_format sliced; // V4L2_BUF_TYPE_SLICED_VBI_CAPTURE
> +#endif
> + __u8 raw_data[200]; // user-defined
> } fmt;
> };
>
> @@ -763,8 +1260,6 @@
> } parm;
> };
>
> -
> -
> /*
> * I O C T L C O D E S F O R V I D E O D E V I C E S
> *
> @@ -774,30 +1269,30 @@
> #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc)
> #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format)
> #define VIDIOC_S_FMT _IOWR ('V', 5, struct v4l2_format)
> -#if 0
> -#define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression)
> -#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
> +#ifdef __KERNEL__
> +#define VIDIOC_G_MPEGCOMP _IOR ('V', 6, struct v4l2_mpeg_compression)
> +#define VIDIOC_S_MPEGCOMP _IOW ('V', 7, struct v4l2_mpeg_compression)
> #endif
> #define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
> #define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
> #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer)
> #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer)
> -#define VIDIOC_OVERLAY _IOWR ('V', 14, int)
> +#define VIDIOC_OVERLAY _IOW ('V', 14, int)
> #define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer)
> #define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer)
> #define VIDIOC_STREAMON _IOW ('V', 18, int)
> #define VIDIOC_STREAMOFF _IOW ('V', 19, int)
> #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm)
> -#define VIDIOC_S_PARM _IOW ('V', 22, struct v4l2_streamparm)
> +#define VIDIOC_S_PARM _IOWR ('V', 22, struct v4l2_streamparm)
> #define VIDIOC_G_STD _IOR ('V', 23, v4l2_std_id)
> #define VIDIOC_S_STD _IOW ('V', 24, v4l2_std_id)
> #define VIDIOC_ENUMSTD _IOWR ('V', 25, struct v4l2_standard)
> #define VIDIOC_ENUMINPUT _IOWR ('V', 26, struct v4l2_input)
> #define VIDIOC_G_CTRL _IOWR ('V', 27, struct v4l2_control)
> -#define VIDIOC_S_CTRL _IOW ('V', 28, struct v4l2_control)
> +#define VIDIOC_S_CTRL _IOWR ('V', 28, struct v4l2_control)
> #define VIDIOC_G_TUNER _IOWR ('V', 29, struct v4l2_tuner)
> #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner)
> -#define VIDIOC_G_AUDIO _IOWR ('V', 33, struct v4l2_audio)
> +#define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio)
> #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio)
> #define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl)
> #define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu)
> @@ -806,49 +1301,47 @@
> #define VIDIOC_G_OUTPUT _IOR ('V', 46, int)
> #define VIDIOC_S_OUTPUT _IOWR ('V', 47, int)
> #define VIDIOC_ENUMOUTPUT _IOWR ('V', 48, struct v4l2_output)
> -#define VIDIOC_G_AUDOUT _IOWR ('V', 49, struct v4l2_audioout)
> +#define VIDIOC_G_AUDOUT _IOR ('V', 49, struct v4l2_audioout)
> #define VIDIOC_S_AUDOUT _IOW ('V', 50, struct v4l2_audioout)
> #define VIDIOC_G_MODULATOR _IOWR ('V', 54, struct v4l2_modulator)
> #define VIDIOC_S_MODULATOR _IOW ('V', 55, struct v4l2_modulator)
> #define VIDIOC_G_FREQUENCY _IOWR ('V', 56, struct v4l2_frequency)
> #define VIDIOC_S_FREQUENCY _IOW ('V', 57, struct v4l2_frequency)
> -#define VIDIOC_CROPCAP _IOR ('V', 58, struct v4l2_cropcap)
> +#define VIDIOC_CROPCAP _IOWR ('V', 58, struct v4l2_cropcap)
> #define VIDIOC_G_CROP _IOWR ('V', 59, struct v4l2_crop)
> #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop)
> #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression)
> #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression)
> #define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id)
> #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format)
> +#define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio)
> +#define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout)
> +#define VIDIOC_G_PRIORITY _IOR ('V', 67, enum v4l2_priority)
> +#define VIDIOC_S_PRIORITY _IOW ('V', 68, enum v4l2_priority)
> +#if 1
> +#define VIDIOC_G_SLICED_VBI_CAP _IOWR ('V', 69, struct v4l2_sliced_vbi_cap)
> +#endif
> +#define VIDIOC_LOG_STATUS _IO ('V', 70)
> +#define VIDIOC_G_EXT_CTRLS _IOWR ('V', 71, struct v4l2_ext_controls)
> +#define VIDIOC_S_EXT_CTRLS _IOWR ('V', 72, struct v4l2_ext_controls)
> +#define VIDIOC_TRY_EXT_CTRLS _IOWR ('V', 73, struct v4l2_ext_controls)
> +#if 1
> +#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum)
> +#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum)
> +#endif
>
> +#ifdef __OLD_VIDIOC_
> +/* for compatibility, will go away some day */
> +#define VIDIOC_OVERLAY_OLD _IOWR ('V', 14, int)
> +#define VIDIOC_S_PARM_OLD _IOW ('V', 22, struct v4l2_streamparm)
> +#define VIDIOC_S_CTRL_OLD _IOW ('V', 28, struct v4l2_control)
> +#define VIDIOC_G_AUDIO_OLD _IOWR ('V', 33, struct v4l2_audio)
> +#define VIDIOC_G_AUDOUT_OLD _IOWR ('V', 49, struct v4l2_audioout)
> +#define VIDIOC_CROPCAP_OLD _IOR ('V', 58, struct v4l2_cropcap)
> +#endif
> +
> #define BASE_VIDIOC_PRIVATE 192 /* 192-255 are private */
>
> -
> -#ifdef __KERNEL__
> -/*
> - *
> - * V 4 L 2 D R I V E R H E L P E R A P I
> - *
> - * Some commonly needed functions for drivers (v4l2-common.o module)
> - */
> -#include <linux/fs.h>
> -
> -/* Video standard functions */
> -extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
> -extern int v4l2_video_std_construct(struct v4l2_standard *vs,
> - int id, char *name);
> -
> -/* Compatibility layer interface */
> -typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
> - unsigned int cmd, void *arg);
> -int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
> - int cmd, void *arg, v4l2_kioctl driver_ioctl);
> -
> -/* names for fancy debug output */
> -extern char *v4l2_field_names[];
> -extern char *v4l2_type_names[];
> -extern char *v4l2_ioctl_names[];
> -
> -#endif /* __KERNEL__ */
> #endif /* __LINUX_VIDEODEV2_H */
>
> /*
--
This is the vlc-devel mailing-list, see http://www.videolan.org/vlc/
To unsubscribe, please read http://developers.videolan.org/lists.html
More information about the vlc-devel
mailing list