aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-ioctl.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2015-10-10 12:51:00 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-10-20 13:40:50 -0400
commit9effc72fd71b6e8fd2676bcb57fac3f05ab93043 (patch)
treeb39342339730a075de69d780fce77921df064d46 /drivers/media/v4l2-core/v4l2-ioctl.c
parentb2411b93cdcb5cb154827b8fcd2f436dd0ddab73 (diff)
[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: Antti Palosaari <crope@iki.fi> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-ioctl.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 056a5ade5870..073ab36b880a 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -153,6 +153,7 @@ const char *v4l2_type_names[] = {
153 [V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE] = "vid-cap-mplane", 153 [V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE] = "vid-cap-mplane",
154 [V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE] = "vid-out-mplane", 154 [V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE] = "vid-out-mplane",
155 [V4L2_BUF_TYPE_SDR_CAPTURE] = "sdr-cap", 155 [V4L2_BUF_TYPE_SDR_CAPTURE] = "sdr-cap",
156 [V4L2_BUF_TYPE_SDR_OUTPUT] = "sdr-out",
156}; 157};
157EXPORT_SYMBOL(v4l2_type_names); 158EXPORT_SYMBOL(v4l2_type_names);
158 159
@@ -326,6 +327,7 @@ static void v4l_print_format(const void *arg, bool write_only)
326 sliced->service_lines[1][i]); 327 sliced->service_lines[1][i]);
327 break; 328 break;
328 case V4L2_BUF_TYPE_SDR_CAPTURE: 329 case V4L2_BUF_TYPE_SDR_CAPTURE:
330 case V4L2_BUF_TYPE_SDR_OUTPUT:
329 sdr = &p->fmt.sdr; 331 sdr = &p->fmt.sdr;
330 pr_cont(", pixelformat=%c%c%c%c\n", 332 pr_cont(", pixelformat=%c%c%c%c\n",
331 (sdr->pixelformat >> 0) & 0xff, 333 (sdr->pixelformat >> 0) & 0xff,
@@ -974,6 +976,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
974 if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap) 976 if (is_sdr && is_rx && ops->vidioc_g_fmt_sdr_cap)
975 return 0; 977 return 0;
976 break; 978 break;
979 case V4L2_BUF_TYPE_SDR_OUTPUT:
980 if (is_sdr && is_tx && ops->vidioc_g_fmt_sdr_out)
981 return 0;
982 break;
977 default: 983 default:
978 break; 984 break;
979 } 985 }
@@ -1324,6 +1330,11 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
1324 break; 1330 break;
1325 ret = ops->vidioc_enum_fmt_sdr_cap(file, fh, arg); 1331 ret = ops->vidioc_enum_fmt_sdr_cap(file, fh, arg);
1326 break; 1332 break;
1333 case V4L2_BUF_TYPE_SDR_OUTPUT:
1334 if (unlikely(!is_tx || !is_sdr || !ops->vidioc_enum_fmt_sdr_out))
1335 break;
1336 ret = ops->vidioc_enum_fmt_sdr_out(file, fh, arg);
1337 break;
1327 } 1338 }
1328 if (ret == 0) 1339 if (ret == 0)
1329 v4l_fill_fmtdesc(p); 1340 v4l_fill_fmtdesc(p);
@@ -1418,6 +1429,10 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
1418 if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap)) 1429 if (unlikely(!is_rx || !is_sdr || !ops->vidioc_g_fmt_sdr_cap))
1419 break; 1430 break;
1420 return ops->vidioc_g_fmt_sdr_cap(file, fh, arg); 1431 return ops->vidioc_g_fmt_sdr_cap(file, fh, arg);
1432 case V4L2_BUF_TYPE_SDR_OUTPUT:
1433 if (unlikely(!is_tx || !is_sdr || !ops->vidioc_g_fmt_sdr_out))
1434 break;
1435 return ops->vidioc_g_fmt_sdr_out(file, fh, arg);
1421 } 1436 }
1422 return -EINVAL; 1437 return -EINVAL;
1423} 1438}
@@ -1497,6 +1512,11 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
1497 break; 1512 break;
1498 CLEAR_AFTER_FIELD(p, fmt.sdr); 1513 CLEAR_AFTER_FIELD(p, fmt.sdr);
1499 return ops->vidioc_s_fmt_sdr_cap(file, fh, arg); 1514 return ops->vidioc_s_fmt_sdr_cap(file, fh, arg);
1515 case V4L2_BUF_TYPE_SDR_OUTPUT:
1516 if (unlikely(!is_tx || !is_sdr || !ops->vidioc_s_fmt_sdr_out))
1517 break;
1518 CLEAR_AFTER_FIELD(p, fmt.sdr);
1519 return ops->vidioc_s_fmt_sdr_out(file, fh, arg);
1500 } 1520 }
1501 return -EINVAL; 1521 return -EINVAL;
1502} 1522}
@@ -1576,6 +1596,11 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
1576 break; 1596 break;
1577 CLEAR_AFTER_FIELD(p, fmt.sdr); 1597 CLEAR_AFTER_FIELD(p, fmt.sdr);
1578 return ops->vidioc_try_fmt_sdr_cap(file, fh, arg); 1598 return ops->vidioc_try_fmt_sdr_cap(file, fh, arg);
1599 case V4L2_BUF_TYPE_SDR_OUTPUT:
1600 if (unlikely(!is_tx || !is_sdr || !ops->vidioc_try_fmt_sdr_out))
1601 break;
1602 CLEAR_AFTER_FIELD(p, fmt.sdr);
1603 return ops->vidioc_try_fmt_sdr_out(file, fh, arg);
1579 } 1604 }
1580 return -EINVAL; 1605 return -EINVAL;
1581} 1606}