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>
This commit is contained in:
parent
db6eb5b334
commit
ada6ecd2bf
|
@ -374,7 +374,9 @@ static const char *v4l2_ioctls[] = {
|
|||
#if 1
|
||||
[_IOC_NR(VIDIOC_ENUM_FRAMESIZES)] = "VIDIOC_ENUM_FRAMESIZES",
|
||||
[_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
|
||||
[_IOC_NR(VIDIOC_G_ENC_INDEX)] = "VIDIOC_G_ENC_INDEX"
|
||||
[_IOC_NR(VIDIOC_G_ENC_INDEX)] = "VIDIOC_G_ENC_INDEX",
|
||||
[_IOC_NR(VIDIOC_ENCODER_CMD)] = "VIDIOC_ENCODER_CMD",
|
||||
[_IOC_NR(VIDIOC_TRY_ENCODER_CMD)] = "VIDIOC_TRY_ENCODER_CMD"
|
||||
#endif
|
||||
};
|
||||
#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
|
||||
|
|
|
@ -1354,6 +1354,30 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
|
|||
p->entries,p->entries_cap);
|
||||
break;
|
||||
}
|
||||
case VIDIOC_ENCODER_CMD:
|
||||
{
|
||||
struct v4l2_encoder_cmd *p=arg;
|
||||
|
||||
if (!vfd->vidioc_encoder_cmd)
|
||||
break;
|
||||
ret=vfd->vidioc_encoder_cmd(file, fh, p);
|
||||
if (!ret)
|
||||
dbgarg (cmd, "cmd=%d, flags=%d\n",
|
||||
p->cmd,p->flags);
|
||||
break;
|
||||
}
|
||||
case VIDIOC_TRY_ENCODER_CMD:
|
||||
{
|
||||
struct v4l2_encoder_cmd *p=arg;
|
||||
|
||||
if (!vfd->vidioc_try_encoder_cmd)
|
||||
break;
|
||||
ret=vfd->vidioc_try_encoder_cmd(file, fh, p);
|
||||
if (!ret)
|
||||
dbgarg (cmd, "cmd=%d, flags=%d\n",
|
||||
p->cmd,p->flags);
|
||||
break;
|
||||
}
|
||||
case VIDIOC_G_PARM:
|
||||
{
|
||||
struct v4l2_streamparm *p=arg;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue