Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (37 commits) V4L/DVB (6382): saa7134: fix NULL dereference at suspend time for cards without IR receiver V4L/DVB (6380): ivtvfb: Removal of the 'osd_compat' module option V4L/DVB (6379): patch which improves GotView Saa7135 remote control V4L/DVB (6378b): Updates info about the removal of V4L1 at feature-removal-schedule.txt V4L/DVB (6378a): Removal of VIDIOC_[G|S]_MPEGCOMP from feature-removal-schedule.txt V4L/DVB (6378): DiB0700-device: Using 1.10 firmware V4L/DVB (6357): pvrusb2: Improve encoder chip health tracking V4L/DVB (6356): "while (!ca->wakeup)" breaks the CAM initialisation V4L/DVB (6352): ir-kbd-i2c: Missing break statement V4L/DVB (6350): V4L: possible leak in em28xx_init_isoc V4L/DVB (6348): ivtv: undo video mute when closing the radio V4L/DVB (6347): ivtv: fix video mute when radio is used V4L/DVB (6346): ivtvfb: YUV output size fix when ivtvfb is not loaded V4L/DVB (6345): ivtvfb: YUV handling of an image which is not visible in the display area V4L/DVB (6343): ivtvfb: check return value of unregister_framebuffer V4L/DVB (6342): ivtv: fix circular locking (bug 9037) V4L/DVB (6341): ivtv: fix resizing MPEG1 streams V4L/DVB (6340): ivtvfb: screen mode change sometimes goes wrong V4L/DVB (6339): ivtv: set the video color to black instead of green when capturing from the radio V4L/DVB (6338): ivtv: fix incorrect EBUSY return ...
This commit is contained in:
Linus Torvalds
@@ -294,48 +294,6 @@ struct video_code
|
||||
#define VID_PLAY_RESET 13
|
||||
#define VID_PLAY_END_MARK 14
|
||||
|
||||
|
||||
|
||||
#define VID_HARDWARE_BT848 1
|
||||
#define VID_HARDWARE_QCAM_BW 2
|
||||
#define VID_HARDWARE_PMS 3
|
||||
#define VID_HARDWARE_QCAM_C 4
|
||||
#define VID_HARDWARE_PSEUDO 5
|
||||
#define VID_HARDWARE_SAA5249 6
|
||||
#define VID_HARDWARE_AZTECH 7
|
||||
#define VID_HARDWARE_SF16MI 8
|
||||
#define VID_HARDWARE_RTRACK 9
|
||||
#define VID_HARDWARE_ZOLTRIX 10
|
||||
#define VID_HARDWARE_SAA7146 11
|
||||
#define VID_HARDWARE_VIDEUM 12 /* Reserved for Winnov videum */
|
||||
#define VID_HARDWARE_RTRACK2 13
|
||||
#define VID_HARDWARE_PERMEDIA2 14 /* Reserved for Permedia2 */
|
||||
#define VID_HARDWARE_RIVA128 15 /* Reserved for RIVA 128 */
|
||||
#define VID_HARDWARE_PLANB 16 /* PowerMac motherboard video-in */
|
||||
#define VID_HARDWARE_BROADWAY 17 /* Broadway project */
|
||||
#define VID_HARDWARE_GEMTEK 18
|
||||
#define VID_HARDWARE_TYPHOON 19
|
||||
#define VID_HARDWARE_VINO 20 /* SGI Indy Vino */
|
||||
#define VID_HARDWARE_CADET 21 /* Cadet radio */
|
||||
#define VID_HARDWARE_TRUST 22 /* Trust FM Radio */
|
||||
#define VID_HARDWARE_TERRATEC 23 /* TerraTec ActiveRadio */
|
||||
#define VID_HARDWARE_CPIA 24
|
||||
#define VID_HARDWARE_ZR36120 25 /* Zoran ZR36120/ZR36125 */
|
||||
#define VID_HARDWARE_ZR36067 26 /* Zoran ZR36067/36060 */
|
||||
#define VID_HARDWARE_OV511 27
|
||||
#define VID_HARDWARE_ZR356700 28 /* Zoran 36700 series */
|
||||
#define VID_HARDWARE_W9966 29
|
||||
#define VID_HARDWARE_SE401 30 /* SE401 USB webcams */
|
||||
#define VID_HARDWARE_PWC 31 /* Philips webcams */
|
||||
#define VID_HARDWARE_MEYE 32 /* Sony Vaio MotionEye cameras */
|
||||
#define VID_HARDWARE_CPIA2 33
|
||||
#define VID_HARDWARE_VICAM 34
|
||||
#define VID_HARDWARE_SF16FMR2 35
|
||||
#define VID_HARDWARE_W9968CF 36
|
||||
#define VID_HARDWARE_SAA7114H 37
|
||||
#define VID_HARDWARE_SN9C102 38
|
||||
#define VID_HARDWARE_ARV 39
|
||||
|
||||
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
|
||||
|
||||
#endif /* __LINUX_VIDEODEV_H */
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user