summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-02-18 18:56:22 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-03-01 16:09:46 +0100
commitada6ecd2bf1d97e1f3bac6d5af4c7c4390a0a5af (patch)
treedcc213321ea37b25abc4d1f835ed3898655aed69 /include
parentV4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl (diff)
downloadlinux-ada6ecd2bf1d97e1f3bac6d5af4c7c4390a0a5af.tar.xz
linux-ada6ecd2bf1d97e1f3bac6d5af4c7c4390a0a5af.zip
V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.
Add support for starting, stopping, pausing and resuming an MPEG (or similar compressed stream) encoder. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/videodev2.h24
-rw-r--r--include/media/v4l2-dev.h4
2 files changed, 27 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 42cfdd2d50db..854875869dbd 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1193,7 +1193,7 @@ struct v4l2_audioout
};
/*
- * M P E G I N D E X
+ * M P E G S E R V I C E S
*
* NOTE: EXPERIMENTAL API
*/
@@ -1218,6 +1218,26 @@ struct v4l2_enc_idx {
__u32 reserved[4];
struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
};
+
+
+#define V4L2_ENC_CMD_START (0)
+#define V4L2_ENC_CMD_STOP (1)
+#define V4L2_ENC_CMD_PAUSE (2)
+#define V4L2_ENC_CMD_RESUME (3)
+
+/* Flags for V4L2_ENC_CMD_STOP */
+#define V4L2_ENC_CMD_STOP_AT_GOP_END (1 << 0)
+
+struct v4l2_encoder_cmd {
+ __u32 cmd;
+ __u32 flags;
+ union {
+ struct {
+ __u32 data[8];
+ } raw;
+ };
+};
+
#endif
@@ -1415,6 +1435,8 @@ struct v4l2_register {
#define VIDIOC_ENUM_FRAMESIZES _IOWR ('V', 74, struct v4l2_frmsizeenum)
#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR ('V', 75, struct v4l2_frmivalenum)
#define VIDIOC_G_ENC_INDEX _IOR ('V', 76, struct v4l2_enc_idx)
+#define VIDIOC_ENCODER_CMD _IOWR ('V', 77, struct v4l2_encoder_cmd)
+#define VIDIOC_TRY_ENCODER_CMD _IOWR ('V', 78, struct v4l2_encoder_cmd)
#endif
/* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */
#define VIDIOC_DBG_S_REGISTER _IOW ('d', 100, struct v4l2_register)
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index e5e87e44c585..1dd3d3239ecf 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -273,6 +273,10 @@ struct video_device
struct v4l2_jpegcompression *a);
int (*vidioc_g_enc_index) (struct file *file, void *fh,
struct v4l2_enc_idx *a);
+ int (*vidioc_encoder_cmd) (struct file *file, void *fh,
+ struct v4l2_encoder_cmd *a);
+ int (*vidioc_try_encoder_cmd) (struct file *file, void *fh,
+ struct v4l2_encoder_cmd *a);
/* Stream type-dependent parameter ioctls */
int (*vidioc_g_parm) (struct file *file, void *fh,