History

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits) [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set [media] it913x [VER 1.07] Support for single ITE 9135 devices [media] Support for Terratec G1 [media] cx25821: off by one in cx25821_vidioc_s_input() [media] media: tea5764: reconcile Kconfig symbol and macro [media] omap_vout: Add poll() support [media] omap3isp: preview: Add crop support on the sink pad [media] omap3isp: preview: Rename min/max input/output sizes defines [media] omap3isp: preview: Remove horizontal averager support [media] omap3isp: Report the ISP revision through the media controller API [media] omap3isp: ccdc: remove redundant operation [media] omap3isp: Fix memory leaks in initialization error paths [media] omap3isp: Add missing mutex_destroy() calls [media] omap3isp: Move *_init_entities() functions to the init/cleanup section [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup() [media] MFC: Change MFC firmware binary name [media] vb2: add vb2_get_unmapped_area in vb2 core [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control [media] media: ov6650: stylistic improvements ...

Linus Torvalds committed 15 years ago

Commit 1046a2c2 parents 46e85f5 b3f4e1e216 files · +10316 −3785Browse files

Showing the changes to include/linux (1 of 216 files). Show all

Unified · Split

include/linux/videodev2.h+27−0
@@ -653,6 +653,10 @@ struct v4l2_buffer { · 652 unmodified lines
653653 #define V4L2_BUF_FLAG_ERROR 0x0040
654654 #define V4L2_BUF_FLAG_TIMECODE 0x0100 /* timecode field is valid */
655655 #define V4L2_BUF_FLAG_INPUT 0x0200 /* input field is valid */
656+#define V4L2_BUF_FLAG_PREPARED 0x0400 /* Buffer is prepared for queuing */
657+/* Cache handling flags */
658+#define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE 0x0800
659+#define V4L2_BUF_FLAG_NO_CACHE_CLEAN 0x1000
656660
657661 /*
658662 * O V E R L A Y P R E V I E W
@@ -1165,6 +1169,7 @@ enum v4l2_power_line_frequency { · 506 unmodified lines
11651169 V4L2_CID_POWER_LINE_FREQUENCY_DISABLED = 0,
11661170 V4L2_CID_POWER_LINE_FREQUENCY_50HZ = 1,
11671171 V4L2_CID_POWER_LINE_FREQUENCY_60HZ = 2,
1172+ V4L2_CID_POWER_LINE_FREQUENCY_AUTO = 3,
11681173 };
11691174 #define V4L2_CID_HUE_AUTO (V4L2_CID_BASE+25)
11701175 #define V4L2_CID_WHITE_BALANCE_TEMPERATURE (V4L2_CID_BASE+26)
@@ -2138,6 +2143,23 @@ struct v4l2_dbg_chip_ident { · 967 unmodified lines
21382143 __u32 revision; /* chip revision, chip specific */
21392144 } __attribute__ ((packed));
21402145
2146+/**
2147+ * struct v4l2_create_buffers - VIDIOC_CREATE_BUFS argument
2148+ * @index: on return, index of the first created buffer
2149+ * @count: entry: number of requested buffers,
2150+ * return: number of created buffers
2151+ * @memory: buffer memory type
2152+ * @format: frame format, for which buffers are requested
2153+ * @reserved: future extensions
2154+ */
2155+struct v4l2_create_buffers {
2156+ __u32 index;
2157+ __u32 count;
2158+ enum v4l2_memory memory;
2159+ struct v4l2_format format;
2160+ __u32 reserved[8];
2161+};
2162+
21412163 /*
21422164 * I O C T L C O D E S F O R V I D E O D E V I C E S
21432165 *
@@ -2228,6 +2250,11 @@ struct v4l2_dbg_chip_ident { · 84 unmodified lines
22282250 #define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct v4l2_event_subscription)
22292251 #define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
22302252
2253+/* Experimental, the below two ioctls may change over the next couple of kernel
2254+ versions */
2255+#define VIDIOC_CREATE_BUFS _IOWR('V', 92, struct v4l2_create_buffers)
2256+#define VIDIOC_PREPARE_BUF _IOWR('V', 93, struct v4l2_buffer)
2257+
22312258 /* Reminder: when adding new ioctls please add support for them to
22322259 drivers/media/video/v4l2-compat-ioctl32.c as well! */
22332260

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