Pull media updates from Mauro Carvalho Chehab: - new framework support for HDMI CEC and remote control support - new encoding codec driver for Mediatek SoC - new frontend driver: helene tuner - added support for NetUp almost universal devices, with supports DVB-C/S/S2/T/T2 and ISDB-T - the mn88472 frontend driver got promoted from staging - a new driver for RCar video input - some soc_camera legacy drivers got removed: timb, omap1, mx2, mx3 - lots of driver cleanups, improvements and fixups * tag 'media/v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (377 commits) [media] cec: always check all_device_types and features [media] cec: poll should check if there is room in the tx queue [media] vivid: support monitor all mode [media] cec: fix test for unconfigured adapter in main message loop [media] cec: limit the size of the transmit queue [media] cec: zero unused msg part after msg->len [media] cec: don't set fh to NULL in CEC_TRANSMIT [media] cec: clear all status fields before transmit and always fill in sequence [media] cec: CEC_RECEIVE overwrote the timeout field [media] cxd2841er: Reading SNR for DVB-C added [media] cxd2841er: Reading BER and UCB for DVB-C added [media] cxd2841er: fix switch-case for DVB-C [media] cxd2841er: fix signal strength scale for ISDB-T [media] cxd2841er: adjust the dB scale for DVB-C [media] cxd2841er: provide signal strength for DVB-C [media] cxd2841er: fix BER report via DVBv5 stats API [media] mb86a20s: apply mask to val after checking for read failure [media] airspy: fix error logic during device register [media] s5p-cec/TODO: add TODO item [media] cec/TODO: drop comment about sphinx documentation ...
Showing the changes to include/uapi (4 of 446 files). Show all
Unified · Split
| @@ -94,6 +94,16 @@ struct media_device_info { · 93 unmodified lines | ||
| 94 | 94 | #define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 0x03002) |
| 95 | 95 | #define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 0x03003) |
| 96 | 96 | |
| 97 | +/* | |
| 98 | + * Processing entities | |
| 99 | + */ | |
| 100 | +#define MEDIA_ENT_F_PROC_VIDEO_COMPOSER (MEDIA_ENT_F_BASE + 0x4001) | |
| 101 | +#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER (MEDIA_ENT_F_BASE + 0x4002) | |
| 102 | +#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV (MEDIA_ENT_F_BASE + 0x4003) | |
| 103 | +#define MEDIA_ENT_F_PROC_VIDEO_LUT (MEDIA_ENT_F_BASE + 0x4004) | |
| 104 | +#define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005) | |
| 105 | +#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006) | |
| 106 | + | |
| 97 | 107 | /* |
| 98 | 108 | * Connectors |
| 99 | 109 | */ |
| @@ -78,5 +78,6 @@ · 77 unmodified lines | ||
| 78 | 78 | #define SERIO_TSC40 0x3d |
| 79 | 79 | #define SERIO_WACOM_IV 0x3e |
| 80 | 80 | #define SERIO_EGALAX 0x3f |
| 81 | +#define SERIO_PULSE8_CEC 0x40 | |
| 81 | 82 | |
| 82 | 83 | #endif /* _UAPI_SERIO_H */ |
| @@ -504,22 +504,16 @@ struct v4l2_pix_format { · 503 unmodified lines | ||
| 504 | 504 | #define V4L2_PIX_FMT_UV8 v4l2_fourcc('U', 'V', '8', ' ') /* 8 UV 4:4 */ |
| 505 | 505 | |
| 506 | 506 | /* Luminance+Chrominance formats */ |
| 507 | −#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0 */ | |
| 508 | −#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0 */ | |
| 509 | 507 | #define V4L2_PIX_FMT_YUYV v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16 YUV 4:2:2 */ |
| 510 | 508 | #define V4L2_PIX_FMT_YYUV v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16 YUV 4:2:2 */ |
| 511 | 509 | #define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ |
| 512 | 510 | #define V4L2_PIX_FMT_UYVY v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16 YUV 4:2:2 */ |
| 513 | 511 | #define V4L2_PIX_FMT_VYUY v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16 YUV 4:2:2 */ |
| 514 | −#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422 planar */ | |
| 515 | −#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16 YVU411 planar */ | |
| 516 | 512 | #define V4L2_PIX_FMT_Y41P v4l2_fourcc('Y', '4', '1', 'P') /* 12 YUV 4:1:1 */ |
| 517 | 513 | #define V4L2_PIX_FMT_YUV444 v4l2_fourcc('Y', '4', '4', '4') /* 16 xxxxyyyy uuuuvvvv */ |
| 518 | 514 | #define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */ |
| 519 | 515 | #define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */ |
| 520 | 516 | #define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */ |
| 521 | −#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0 */ | |
| 522 | −#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y', 'U', '1', '2') /* 12 YUV 4:2:0 */ | |
| 523 | 517 | #define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */ |
| 524 | 518 | #define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */ |
| 525 | 519 | #define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */ |
| @@ -540,6 +534,14 @@ struct v4l2_pix_format { · 14 unmodified lines | ||
| 540 | 534 | #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ |
| 541 | 535 | #define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 macroblocks */ |
| 542 | 536 | |
| 537 | +/* three planes - Y Cb, Cr */ | |
| 538 | +#define V4L2_PIX_FMT_YUV410 v4l2_fourcc('Y', 'U', 'V', '9') /* 9 YUV 4:1:0 */ | |
| 539 | +#define V4L2_PIX_FMT_YVU410 v4l2_fourcc('Y', 'V', 'U', '9') /* 9 YVU 4:1:0 */ | |
| 540 | +#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 12 YVU411 planar */ | |
| 541 | +#define V4L2_PIX_FMT_YUV420 v4l2_fourcc('Y', 'U', '1', '2') /* 12 YUV 4:2:0 */ | |
| 542 | +#define V4L2_PIX_FMT_YVU420 v4l2_fourcc('Y', 'V', '1', '2') /* 12 YVU 4:2:0 */ | |
| 543 | +#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16 YVU422 planar */ | |
| 544 | + | |
| 543 | 545 | /* three non contiguous planes - Y, Cb, Cr */ |
| 544 | 546 | #define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */ |
| 545 | 547 | #define V4L2_PIX_FMT_YVU420M v4l2_fourcc('Y', 'M', '2', '1') /* 12 YVU420 planar */ |
| @@ -1,34 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * vsp1.h | |
| 3 | − * | |
| 4 | − * Renesas R-Car VSP1 - User-space API | |
| 5 | − * | |
| 6 | − * Copyright (C) 2013 Renesas Corporation | |
| 7 | − * | |
| 8 | − * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com> | |
| 9 | − * | |
| 10 | − * This program is free software; you can redistribute it and/or modify | |
| 11 | − * it under the terms of the GNU General Public License version 2 as | |
| 12 | − * published by the Free Software Foundation. | |
| 13 | − */ | |
| 14 | − | |
| 15 | −#ifndef __VSP1_USER_H__ | |
| 16 | −#define __VSP1_USER_H__ | |
| 17 | − | |
| 18 | −#include <linux/types.h> | |
| 19 | −#include <linux/videodev2.h> | |
| 20 | − | |
| 21 | −/* | |
| 22 | − * Private IOCTLs | |
| 23 | − * | |
| 24 | − * VIDIOC_VSP1_LUT_CONFIG - Configure the lookup table | |
| 25 | − */ | |
| 26 | − | |
| 27 | −#define VIDIOC_VSP1_LUT_CONFIG \ | |
| 28 | − _IOWR('V', BASE_VIDIOC_PRIVATE + 1, struct vsp1_lut_config) | |
| 29 | − | |
| 30 | −struct vsp1_lut_config { | |
| 31 | − __u32 lut[256]; | |
| 32 | −}; | |
| 33 | − | |
| 34 | −#endif /* __VSP1_USER_H__ */ | |