Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9effc72f authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: add support for SDR transmitter 



New IOCTL ops:
vidioc_enum_fmt_sdr_out
vidioc_g_fmt_sdr_out
vidioc_s_fmt_sdr_out
vidioc_try_fmt_sdr_out

New vb2 buffertype:
V4L2_BUF_TYPE_SDR_OUTPUT

New v4l2 capability:
V4L2_CAP_SDR_OUTPUT

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent b2411b93

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us 
	case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:

		return get_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);

	case V4L2_BUF_TYPE_SDR_CAPTURE:

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		return get_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr);

	default:

		pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
@@ -260,6 +261,7 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us 
	case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:

		return put_v4l2_sliced_vbi_format(&kp->fmt.sliced, &up->fmt.sliced);

	case V4L2_BUF_TYPE_SDR_CAPTURE:

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		return put_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr);

	default:

		pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n",

drivers/media/v4l2-core/v4l2-dev.c

+12 −2
Original line number Diff line number Diff line
@@ -637,8 +637,8 @@ static void determine_valid_ioctls(struct video_device *vdev) 
			       ops->vidioc_try_fmt_sliced_vbi_out)))

			set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);

		SET_VALID_IOCTL(ops, VIDIOC_G_SLICED_VBI_CAP, vidioc_g_sliced_vbi_cap);

	} else if (is_sdr) {

		/* SDR specific ioctls */

	} else if (is_sdr && is_rx) {

		/* SDR receiver specific ioctls */

		if (ops->vidioc_enum_fmt_sdr_cap)

			set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);

		if (ops->vidioc_g_fmt_sdr_cap)
@@ -647,6 +647,16 @@ static void determine_valid_ioctls(struct video_device *vdev) 
			set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);

		if (ops->vidioc_try_fmt_sdr_cap)

			set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);

	} else if (is_sdr && is_tx) {

		/* SDR transmitter specific ioctls */

		if (ops->vidioc_enum_fmt_sdr_out)

			set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);

		if (ops->vidioc_g_fmt_sdr_out)

			set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);

		if (ops->vidioc_s_fmt_sdr_out)

			set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);

		if (ops->vidioc_try_fmt_sdr_out)

			set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);

	}



	if (is_vid || is_vbi || is_sdr) {

drivers/media/v4l2-core/v4l2-ioctl.c

+25 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ const char *v4l2_type_names[] = { 
	[V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE] = "vid-cap-mplane",

	[V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE] = "vid-out-mplane",

	[V4L2_BUF_TYPE_SDR_CAPTURE]        = "sdr-cap",

	[V4L2_BUF_TYPE_SDR_OUTPUT]         = "sdr-out",

};

EXPORT_SYMBOL(v4l2_type_names);
@@ -326,6 +327,7 @@ static void v4l_print_format(const void *arg, bool write_only) 
				sliced->service_lines[1][i]);

		break;

	case V4L2_BUF_TYPE_SDR_CAPTURE:

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		sdr = &p->fmt.sdr;

		pr_cont(", pixelformat=%c%c%c%c\n",

			(sdr->pixelformat >>  0) & 0xff,
@@ -974,6 +976,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) 
		if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap)

			return 0;

		break;

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		if (is_sdr && is_tx && ops->vidioc_g_fmt_sdr_out)

			return 0;

		break;

	default:

		break;

	}
@@ -1324,6 +1330,11 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, 
			break;

		ret = ops->vidioc_enum_fmt_sdr_cap(file, fh, arg);

		break;

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		if (unlikely(!is_tx || !is_sdr || !ops->vidioc_enum_fmt_sdr_out))

			break;

		ret = ops->vidioc_enum_fmt_sdr_out(file, fh, arg);

		break;

	}

	if (ret == 0)

		v4l_fill_fmtdesc(p);
@@ -1418,6 +1429,10 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops, 
		if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap))

			break;

		return ops->vidioc_g_fmt_sdr_cap(file, fh, arg);

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		if (unlikely(!is_tx || !is_sdr || !ops->vidioc_g_fmt_sdr_out))

			break;

		return ops->vidioc_g_fmt_sdr_out(file, fh, arg);

	}

	return -EINVAL;

}
@@ -1497,6 +1512,11 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
			break;

		CLEAR_AFTER_FIELD(p, fmt.sdr);

		return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		if (unlikely(!is_tx || !is_sdr || !ops->vidioc_s_fmt_sdr_out))

			break;

		CLEAR_AFTER_FIELD(p, fmt.sdr);

		return ops->vidioc_s_fmt_sdr_out(file, fh, arg);

	}

	return -EINVAL;

}
@@ -1576,6 +1596,11 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
			break;

		CLEAR_AFTER_FIELD(p, fmt.sdr);

		return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);

	case V4L2_BUF_TYPE_SDR_OUTPUT:

		if (unlikely(!is_tx || !is_sdr || !ops->vidioc_try_fmt_sdr_out))

			break;

		CLEAR_AFTER_FIELD(p, fmt.sdr);

		return ops->vidioc_try_fmt_sdr_out(file, fh, arg);

	}

	return -EINVAL;

}

drivers/media/v4l2-core/videobuf-core.c

+3 −1
Original line number Diff line number Diff line
@@ -576,7 +576,8 @@ int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b) 
		}

		if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT

		    || q->type == V4L2_BUF_TYPE_VBI_OUTPUT

		    || q->type == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {

		    || q->type == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT

		    || q->type == V4L2_BUF_TYPE_SDR_OUTPUT) {

			buf->size = b->bytesused;

			buf->field = b->field;

			buf->ts = b->timestamp;
@@ -1154,6 +1155,7 @@ unsigned int videobuf_poll_stream(struct file *file, 
			case V4L2_BUF_TYPE_VIDEO_OUTPUT:

			case V4L2_BUF_TYPE_VBI_OUTPUT:

			case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:

			case V4L2_BUF_TYPE_SDR_OUTPUT:

				rc = POLLOUT | POLLWRNORM;

				break;

			default:

include/media/v4l2-ioctl.h

+8 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ struct v4l2_ioctl_ops { 
					      struct v4l2_fmtdesc *f);

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

					    struct v4l2_fmtdesc *f);

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

					    struct v4l2_fmtdesc *f);



	/* VIDIOC_G_FMT handlers */

	int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
@@ -60,6 +62,8 @@ struct v4l2_ioctl_ops { 
					   struct v4l2_format *f);

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

					struct v4l2_format *f);

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

					struct v4l2_format *f);



	/* VIDIOC_S_FMT handlers */

	int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
@@ -84,6 +88,8 @@ struct v4l2_ioctl_ops { 
					   struct v4l2_format *f);

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

					struct v4l2_format *f);

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

					struct v4l2_format *f);



	/* VIDIOC_TRY_FMT handlers */

	int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
@@ -108,6 +114,8 @@ struct v4l2_ioctl_ops { 
					     struct v4l2_format *f);

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

					  struct v4l2_format *f);

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

					  struct v4l2_format *f);



	/* Buffer handlers */

	int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);