History

[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

Antti Palosaari committed 11 years ago

Commit 9effc721 parent b2411b97 files · +55 −4Browse files

Showing the changes to include (3 of 7 files). Show all

Unified · Split

3 files
  1. include/media/v4l2-ioctl.h +8 −0
  2. include/trace/events/v4l2.h +1 −0
  3. include/uapi/linux/videodev2.h +4 −1
include/media/v4l2-ioctl.h+8−0
@@ -36,6 +36,8 @@ struct v4l2_ioctl_ops { · 35 unmodified lines
3636 struct v4l2_fmtdesc *f);
3737 int (*vidioc_enum_fmt_sdr_cap) (struct file *file, void *fh,
3838 struct v4l2_fmtdesc *f);
39+ int (*vidioc_enum_fmt_sdr_out) (struct file *file, void *fh,
40+ struct v4l2_fmtdesc *f);
3941
4042 /* VIDIOC_G_FMT handlers */
4143 int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh,
@@ -60,6 +62,8 @@ struct v4l2_ioctl_ops { · 18 unmodified lines
6062 struct v4l2_format *f);
6163 int (*vidioc_g_fmt_sdr_cap) (struct file *file, void *fh,
6264 struct v4l2_format *f);
65+ int (*vidioc_g_fmt_sdr_out) (struct file *file, void *fh,
66+ struct v4l2_format *f);
6367
6468 /* VIDIOC_S_FMT handlers */
6569 int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh,
@@ -84,6 +88,8 @@ struct v4l2_ioctl_ops { · 18 unmodified lines
8488 struct v4l2_format *f);
8589 int (*vidioc_s_fmt_sdr_cap) (struct file *file, void *fh,
8690 struct v4l2_format *f);
91+ int (*vidioc_s_fmt_sdr_out) (struct file *file, void *fh,
92+ struct v4l2_format *f);
8793
8894 /* VIDIOC_TRY_FMT handlers */
8995 int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh,
@@ -108,6 +114,8 @@ struct v4l2_ioctl_ops { · 18 unmodified lines
108114 struct v4l2_format *f);
109115 int (*vidioc_try_fmt_sdr_cap) (struct file *file, void *fh,
110116 struct v4l2_format *f);
117+ int (*vidioc_try_fmt_sdr_out) (struct file *file, void *fh,
118+ struct v4l2_format *f);
111119
112120 /* Buffer handlers */
113121 int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
include/trace/events/v4l2.h+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 EM( V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" ) \
2929 EM( V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, "VIDEO_OUTPUT_MPLANE" ) \
3030 EM( V4L2_BUF_TYPE_SDR_CAPTURE, "SDR_CAPTURE" ) \
31+ EM( V4L2_BUF_TYPE_SDR_OUTPUT, "SDR_OUTPUT" ) \
3132 EMe(V4L2_BUF_TYPE_PRIVATE, "PRIVATE" )
3233
3334 SHOW_TYPE
include/uapi/linux/videodev2.h+4−1
@@ -145,6 +145,7 @@ enum v4l2_buf_type { · 144 unmodified lines
145145 V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
146146 V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,
147147 V4L2_BUF_TYPE_SDR_CAPTURE = 11,
148+ V4L2_BUF_TYPE_SDR_OUTPUT = 12,
148149 /* Deprecated, do not use */
149150 V4L2_BUF_TYPE_PRIVATE = 0x80,
150151 };
@@ -159,7 +160,8 @@ enum v4l2_buf_type { · 8 unmodified lines
159160 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY \
160161 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \
161162 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \
162− || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
163+ || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \
164+ || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)
163165
164166 enum v4l2_tuner_type {
165167 V4L2_TUNER_RADIO = 1,
@@ -435,6 +437,7 @@ struct v4l2_capability { · 269 unmodified lines
435437
436438 #define V4L2_CAP_SDR_CAPTURE 0x00100000 /* Is a SDR capture device */
437439 #define V4L2_CAP_EXT_PIX_FORMAT 0x00200000 /* Supports the extended pixel format */
440+#define V4L2_CAP_SDR_OUTPUT 0x00400000 /* Is a SDR output device */
438441
439442 #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */
440443 #define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t