lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (6321): Remove obsolete VIDIOC_S/G_MPEGCOMP ioctls

Browse Source 
Remove the obsolete VIDIOC_G_MPEGCOMP and VIDIOC_S_MPEGCOMP ioctls from
the V4L2 API as per the removal schedule (October 2007).

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
2007-10-11 06:38:18 -03:00
committed by Mauro Carvalho Chehab
parent 22c4a4e98e
commit 3bcc95760c
7 changed files with 0 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
include/linux/videodev2.h
View File

@@ -441,94 +441,6 @@ struct v4l2_timecode
#define V4L2_TC_USERBITS_8BITCHARS 0x0008
/* The above is based on SMPTE timecodes */
#ifdef __KERNEL__
/*
* 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!
*
*/
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
{
int quality;
@@ -1420,10 +1332,6 @@ struct v4l2_chip_ident {
#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)
#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)