History

[media] v4l: add stream format for SDR receiver

Add new V4L2 stream format definition, V4L2_BUF_TYPE_SDR_CAPTURE, for SDR receiver.

Antti Palosaari committed 12 years ago

Commit 6f3073b1 parent 67f9a113 files · +13 −0Browse files

Unified · Split

3 files
  1. drivers/media/v4l2-core/v4l2-ioctl.c +1 −0
  2. include/trace/events/v4l2.h +1 −0
  3. include/uapi/linux/videodev2.h +11 −0
drivers/media/v4l2-core/v4l2-ioctl.c+1−0
@@ -152,6 +152,7 @@ const char *v4l2_type_names[] = { · 151 unmodified lines
152 [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "vid-out-overlay",152 [V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY] = "vid-out-overlay",
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};156};
156EXPORT_SYMBOL(v4l2_type_names);157EXPORT_SYMBOL(v4l2_type_names);
157 158
include/trace/events/v4l2.h+1−0
@@ -18,6 +18,7 @@ · 17 unmodified lines
18 { V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY, "VIDEO_OUTPUT_OVERLAY" },\18 { V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY, "VIDEO_OUTPUT_OVERLAY" },\
19 { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" },\19 { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" },\
20 { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, "VIDEO_OUTPUT_MPLANE" }, \20 { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, "VIDEO_OUTPUT_MPLANE" }, \
21 { V4L2_BUF_TYPE_SDR_CAPTURE, "SDR_CAPTURE" }, \
21 { V4L2_BUF_TYPE_PRIVATE, "PRIVATE" })22 { V4L2_BUF_TYPE_PRIVATE, "PRIVATE" })
22 23
23#define show_field(field) \24#define show_field(field) \
include/uapi/linux/videodev2.h+11−0
@@ -139,6 +139,7 @@ enum v4l2_buf_type { · 138 unmodified lines
139#endif139#endif
140 V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,140 V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
141 V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,141 V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE = 10,
142 V4L2_BUF_TYPE_SDR_CAPTURE = 11,
142 /* Deprecated, do not use */143 /* Deprecated, do not use */
143 V4L2_BUF_TYPE_PRIVATE = 0x80,144 V4L2_BUF_TYPE_PRIVATE = 0x80,
144};145};
@@ -1694,6 +1695,15 @@ struct v4l2_pix_format_mplane { · 1549 unmodified lines
1694 __u8 reserved[11];1695 __u8 reserved[11];
1695} __attribute__ ((packed));1696} __attribute__ ((packed));
1696 1697
1698/**
1699 * struct v4l2_format_sdr - SDR format definition
1700 * @pixelformat: little endian four character code (fourcc)
1701 */
1702struct v4l2_format_sdr {
1703 __u32 pixelformat;
1704 __u8 reserved[28];
1705} __attribute__ ((packed));
1706
1697/**1707/**
1698 * struct v4l2_format - stream data format1708 * struct v4l2_format - stream data format
1699 * @type: enum v4l2_buf_type; type of the data stream1709 * @type: enum v4l2_buf_type; type of the data stream
@@ -1712,6 +1722,7 @@ struct v4l2_format { · 12 unmodified lines
1712 struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */1722 struct v4l2_window win; /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
1713 struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */1723 struct v4l2_vbi_format vbi; /* V4L2_BUF_TYPE_VBI_CAPTURE */
1714 struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */1724 struct v4l2_sliced_vbi_format sliced; /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
1725 struct v4l2_format_sdr sdr; /* V4L2_BUF_TYPE_SDR_CAPTURE */
1715 __u8 raw_data[200]; /* user-defined */1726 __u8 raw_data[200]; /* user-defined */
1716 } fmt;1727 } fmt;
1717};1728};

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