Commit db6eb5b3 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl 



The VIDIOC_G_ENC_INDEX ioctl can obtain the MPEG index from an MPEG
encoder.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 1d1370a4

drivers/media/video/v4l2-common.c

+6 −3
Original line number Diff line number Diff line
@@ -366,13 +366,16 @@ static const char *v4l2_ioctls[] = { 
	[_IOC_NR(VIDIOC_ENUMAUDOUT)]       = "VIDIOC_ENUMAUDOUT",

	[_IOC_NR(VIDIOC_G_PRIORITY)]       = "VIDIOC_G_PRIORITY",

	[_IOC_NR(VIDIOC_S_PRIORITY)]       = "VIDIOC_S_PRIORITY",

#if 1

	[_IOC_NR(VIDIOC_G_SLICED_VBI_CAP)] = "VIDIOC_G_SLICED_VBI_CAP",

#endif

	[_IOC_NR(VIDIOC_LOG_STATUS)]       = "VIDIOC_LOG_STATUS",

	[_IOC_NR(VIDIOC_G_EXT_CTRLS)]      = "VIDIOC_G_EXT_CTRLS",

	[_IOC_NR(VIDIOC_S_EXT_CTRLS)]      = "VIDIOC_S_EXT_CTRLS",

	[_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS"

	[_IOC_NR(VIDIOC_TRY_EXT_CTRLS)]    = "VIDIOC_TRY_EXT_CTRLS",

#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"

#endif

};

#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)

drivers/media/video/videodev.c

+12 −0
Original line number Diff line number Diff line
@@ -1342,6 +1342,18 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, 
			ret=vfd->vidioc_s_jpegcomp(file, fh, p);

		break;

	}

	case VIDIOC_G_ENC_INDEX:

	{

		struct v4l2_enc_idx *p=arg;



		if (!vfd->vidioc_g_enc_index)

			break;

		ret=vfd->vidioc_g_enc_index(file, fh, p);

		if (!ret)

			dbgarg (cmd, "entries=%d, entries_cap=%d\n",

					p->entries,p->entries_cap);

		break;

	}

	case VIDIOC_G_PARM:

	{

		struct v4l2_streamparm *p=arg;

include/linux/videodev2.h

+30 −0
Original line number Diff line number Diff line
@@ -1192,6 +1192,35 @@ struct v4l2_audioout 
	__u32	reserved[2];

};



/*

 *	M P E G   I N D E X

 *

 *	NOTE: EXPERIMENTAL API

 */

#if 1

#define V4L2_ENC_IDX_FRAME_I    (0)

#define V4L2_ENC_IDX_FRAME_P    (1)

#define V4L2_ENC_IDX_FRAME_B    (2)

#define V4L2_ENC_IDX_FRAME_MASK (0xf)



struct v4l2_enc_idx_entry {

	__u64 offset;

	__u64 pts;

	__u32 length;

	__u32 flags;

	__u32 reserved[2];

};



#define V4L2_ENC_IDX_ENTRIES (64)

struct v4l2_enc_idx {

	__u32 entries;

	__u32 entries_cap;

	__u32 reserved[4];

	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];

};

#endif





/*

 *	D A T A   S E R V I C E S   ( V B I )

 *
@@ -1385,6 +1414,7 @@ struct v4l2_register { 
#if 1

#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)

#endif

/* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */

#define	VIDIOC_DBG_S_REGISTER 	_IOW ('d', 100, struct v4l2_register)

include/media/v4l2-dev.h

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ struct video_device 
					struct v4l2_jpegcompression *a);

	int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,

					struct v4l2_jpegcompression *a);

	int (*vidioc_g_enc_index)      (struct file *file, void *fh,

					struct v4l2_enc_idx *a);



	/* Stream type-dependent parameter ioctls */

	int (*vidioc_g_parm)           (struct file *file, void *fh,