History

Merge remote-tracking branch 'linuxtv/vsp1' into HEAD

Laurent Pinchart committed 10 years ago

Commit 4c440052 parents d2eaa59 1892293319 files · +9323 −3434Browse files

Showing the changes to include/uapi (4 of 319 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/media.h +25 −18
  2. include/uapi/linux/v4l2-common.h +35 −11
  3. include/uapi/linux/v4l2-controls.h +11 −0
  4. include/uapi/linux/videodev2.h +4 −0
include/uapi/linux/media.h+25−18
@@ -72,21 +72,28 @@ struct media_device_info { · 71 unmodified lines
7272 #define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 4)
7373
7474 /*
75− * Connectors
75+ * I/O entities
7676 */
77−/* It is a responsibility of the entity drivers to add connectors and links */
78−#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 21)
79−#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 22)
80−#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 23)
81−/* For internal test signal generators and other debug connectors */
82−#define MEDIA_ENT_F_CONN_TEST (MEDIA_ENT_F_BASE + 24)
77+#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 1001)
78+#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 1002)
79+#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 1003)
8380
8481 /*
85− * I/O entities
82+ * Analog TV IF-PLL decoders
83+ *
84+ * It is a responsibility of the master/bridge drivers to create links
85+ * for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
86+ */
87+#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
88+#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
89+
90+/*
91+ * Connectors
8692 */
87−#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 31)
88−#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 32)
89−#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 33)
93+/* It is a responsibility of the entity drivers to add connectors and links */
94+#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 10001)
95+#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 10002)
96+#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 10003)
9097
9198 /*
9299 * Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and
@@ -107,8 +114,12 @@ struct media_device_info { · 14 unmodified lines
107114 #define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3)
108115 #define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)
109116 /*
110− * It is a responsibility of the entity drivers to add connectors and links
111− * for the tuner entities.
117+ * It is a responsibility of the master/bridge drivers to add connectors
118+ * and links for MEDIA_ENT_F_TUNER. Please notice that some old tuners
119+ * may require the usage of separate I2C chips to decode analog TV signals,
120+ * when the master/bridge chipset doesn't have its own TV standard decoder.
121+ * On such cases, the IF-PLL staging is mapped via one or two entities:
122+ * MEDIA_ENT_F_IF_VID_DECODER and/or MEDIA_ENT_F_IF_AUD_DECODER.
112123 */
113124 #define MEDIA_ENT_F_TUNER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 5)
114125
@@ -286,7 +297,7 @@ struct media_links_enum { · 171 unmodified lines
286297 * later, before the adding this API upstream.
287298 */
288299
289−#if 0 /* Let's postpone it to Kernel 4.6 */
300+
290301 struct media_v2_entity {
291302 __u32 id;
292303 char name[64]; /* FIXME: move to a property? (RFC says so) */
@@ -351,7 +362,6 @@ static inline void __user *media_get_uptr(__u64 arg) · 58 unmodified lines
351362 {
352363 return (void __user *)(uintptr_t)arg;
353364 }
354−#endif
355365
356366 /* ioctls */
357367
@@ -359,9 +369,6 @@ static inline void __user *media_get_uptr(__u64 arg) · 1 unmodified line
359369 #define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)
360370 #define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum)
361371 #define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc)
362−
363−#if 0 /* Let's postpone it to Kernel 4.6 */
364372 #define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology)
365−#endif
366373
367374 #endif /* __LINUX_MEDIA_H */
include/uapi/linux/v4l2-common.h+35−11
@@ -10,19 +10,43 @@ · 9 unmodified lines
1010 * Copyright (C) 2012 Nokia Corporation
1111 * Contact: Sakari Ailus <sakari.ailus@iki.fi>
1212 *
13− * This program is free software; you can redistribute it and/or
14− * modify it under the terms of the GNU General Public License
15− * version 2 as published by the Free Software Foundation.
13+ * This program is free software; you can redistribute it and/or modify
14+ * it under the terms of the GNU General Public License as published by
15+ * the Free Software Foundation; either version 2 of the License, or
16+ * (at your option) any later version.
1617 *
17− * This program is distributed in the hope that it will be useful, but
18− * WITHOUT ANY WARRANTY; without even the implied warranty of
19− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
20− * General Public License for more details.
18+ * This program is distributed in the hope that it will be useful,
19+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
20+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+ * GNU General Public License for more details.
2122 *
22− * You should have received a copy of the GNU General Public License
23− * along with this program; if not, write to the Free Software
24− * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
25− * 02110-1301 USA
23+ * Alternatively you can redistribute this file under the terms of the
24+ * BSD license as stated below:
25+ *
26+ * Redistribution and use in source and binary forms, with or without
27+ * modification, are permitted provided that the following conditions
28+ * are met:
29+ * 1. Redistributions of source code must retain the above copyright
30+ * notice, this list of conditions and the following disclaimer.
31+ * 2. Redistributions in binary form must reproduce the above copyright
32+ * notice, this list of conditions and the following disclaimer in
33+ * the documentation and/or other materials provided with the
34+ * distribution.
35+ * 3. The names of its contributors may not be used to endorse or promote
36+ * products derived from this software without specific prior written
37+ * permission.
38+ *
39+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
40+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
41+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
42+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
43+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
44+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
45+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
46+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
47+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
48+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
49+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2650 *
2751 */
2852
include/uapi/linux/v4l2-controls.h+11−0
@@ -390,6 +390,7 @@ enum v4l2_mpeg_video_multi_slice_mode { · 389 unmodified lines
390390 #define V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER (V4L2_CID_MPEG_BASE+226)
391391 #define V4L2_CID_MPEG_VIDEO_MV_H_SEARCH_RANGE (V4L2_CID_MPEG_BASE+227)
392392 #define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_MPEG_BASE+228)
393+#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_MPEG_BASE+229)
393394
394395 #define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300)
395396 #define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301)
@@ -912,8 +913,18 @@ enum v4l2_dv_rgb_range { · 516 unmodified lines
912913 V4L2_DV_RGB_RANGE_FULL = 2,
913914 };
914915
916+#define V4L2_CID_DV_TX_IT_CONTENT_TYPE (V4L2_CID_DV_CLASS_BASE + 6)
917+enum v4l2_dv_it_content_type {
918+ V4L2_DV_IT_CONTENT_TYPE_GRAPHICS = 0,
919+ V4L2_DV_IT_CONTENT_TYPE_PHOTO = 1,
920+ V4L2_DV_IT_CONTENT_TYPE_CINEMA = 2,
921+ V4L2_DV_IT_CONTENT_TYPE_GAME = 3,
922+ V4L2_DV_IT_CONTENT_TYPE_NO_ITC = 4,
923+};
924+
915925 #define V4L2_CID_DV_RX_POWER_PRESENT (V4L2_CID_DV_CLASS_BASE + 100)
916926 #define V4L2_CID_DV_RX_RGB_RANGE (V4L2_CID_DV_CLASS_BASE + 101)
927+#define V4L2_CID_DV_RX_IT_CONTENT_TYPE (V4L2_CID_DV_CLASS_BASE + 102)
917928
918929 #define V4L2_CID_FM_RX_CLASS_BASE (V4L2_CTRL_CLASS_FM_RX | 0x900)
919930 #define V4L2_CID_FM_RX_CLASS (V4L2_CTRL_CLASS_FM_RX | 1)
include/uapi/linux/videodev2.h+4−0
@@ -546,6 +546,10 @@ struct v4l2_pix_format { · 545 unmodified lines
546546 /* three non contiguous planes - Y, Cb, Cr */
547547 #define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */
548548 #define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12 YVU420 planar */
549+#define V4L2_PIX_FMT_YUV422M v4l2_fourcc('Y', 'M', '1', '6') /* 16 YUV422 planar */
550+#define V4L2_PIX_FMT_YVU422M v4l2_fourcc('Y', 'M', '6', '1') /* 16 YVU422 planar */
551+#define V4L2_PIX_FMT_YUV444M v4l2_fourcc('Y', 'M', '2', '4') /* 24 YUV444 planar */
552+#define V4L2_PIX_FMT_YVU444M v4l2_fourcc('Y', 'M', '4', '2') /* 24 YVU444 planar */
549553
550554 /* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
551555 #define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B', 'A', '8', '1') /* 8 BGBG.. GRGR.. */

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