diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-10 11:07:24 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-10 11:07:24 +0000 |
| commit | 2acc4a76d33deb986d81d45c29eb1a2b6e97b020 (patch) | |
| tree | 7e57109c66f4f589a0a7a2d60eac6c6ae43f0e4d /linux/include | |
| parent | 7defb807a53a4d8c71e434e31f73d58cbf195cdc (diff) | |
| download | mediapointer-dvb-s2-2acc4a76d33deb986d81d45c29eb1a2b6e97b020.tar.gz mediapointer-dvb-s2-2acc4a76d33deb986d81d45c29eb1a2b6e97b020.tar.bz2 | |
- lots of empress stuff from Andrew de Quincey + some rewrites from me.
- misc fixes.
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 8 | ||||
| -rw-r--r-- | linux/include/media/saa6752hs.h | 29 |
2 files changed, 27 insertions, 10 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 15571c046..f75722fd3 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -276,7 +276,7 @@ struct v4l2_timecode enum v4l2_bitrate_mode { - V4L2_BITRATE_NONE, /* not specified */ + V4L2_BITRATE_NONE = 0, /* not specified */ V4L2_BITRATE_CBR, /* constant bitrate */ V4L2_BITRATE_VBR, /* variable bitrate */ }; @@ -858,9 +858,9 @@ struct v4l2_streamparm #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) +#if 1 /* experimental */ +#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) diff --git a/linux/include/media/saa6752hs.h b/linux/include/media/saa6752hs.h index 135f9a682..791bad2b8 100644 --- a/linux/include/media/saa6752hs.h +++ b/linux/include/media/saa6752hs.h @@ -18,14 +18,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifndef _SAA6752HS_H +#if 0 /* ndef _SAA6752HS_H */ #define _SAA6752HS_H -enum mpeg_bitrate_mode { - MPEG_BITRATE_MODE_VBR = 0, /* Variable bitrate */ - MPEG_BITRATE_MODE_CBR = 1, /* Constant bitrate */ +enum mpeg_video_bitrate_mode { + MPEG_VIDEO_BITRATE_MODE_VBR = 0, /* Variable bitrate */ + MPEG_VIDEO_BITRATE_MODE_CBR = 1, /* Constant bitrate */ - MPEG_BITRATE_MODE_MAX + MPEG_VIDEO_BITRATE_MODE_MAX }; enum mpeg_audio_bitrate { @@ -35,16 +35,33 @@ enum mpeg_audio_bitrate { MPEG_AUDIO_BITRATE_MAX }; +enum mpeg_video_format { + MPEG_VIDEO_FORMAT_D1 = 0, + MPEG_VIDEO_FORMAT_2_3_D1 = 1, + MPEG_VIDEO_FORMAT_1_2_D1 = 2, + MPEG_VIDEO_FORMAT_SIF = 3, + + MPEG_VIDEO_FORMAT_MAX +}; + #define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 #define MPEG_VIDEO_MAX_BITRATE_MAX 27000 #define MPEG_TOTAL_BITRATE_MAX 27000 +#define MPEG_PID_MAX ((1 << 14) - 1) struct mpeg_params { - enum mpeg_bitrate_mode bitrate_mode; + enum mpeg_video_bitrate_mode video_bitrate_mode; unsigned int video_target_bitrate; unsigned int video_max_bitrate; // only used for VBR enum mpeg_audio_bitrate audio_bitrate; unsigned int total_bitrate; + + unsigned int pmt_pid; + unsigned int video_pid; + unsigned int audio_pid; + unsigned int pcr_pid; + + enum mpeg_video_format video_format; }; #define MPEG_SETPARAMS _IOW('6',100,struct mpeg_params) |