{"id":3821,"url":"https://patchwork.libcamera.org/api/1.1/patches/3821/?format=json","web_url":"https://patchwork.libcamera.org/patch/3821/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200519125050.256010-1-jacopo@jmondi.org>","date":"2020-05-19T12:50:50","name":"[libcamera-devel] include: linux: Update v4l2-controls.h","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c8e353fb88d3acc5143b6e4d767b2df07943aac8","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3821/mbox/","series":[{"id":914,"url":"https://patchwork.libcamera.org/api/1.1/series/914/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=914","date":"2020-05-19T12:50:50","name":"[libcamera-devel] include: linux: Update v4l2-controls.h","version":1,"mbox":"https://patchwork.libcamera.org/series/914/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3821/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3821/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 21F6D603D9\n\tfor ;\n\tTue, 19 May 2020 14:47:37 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id 9A3E1200004;\n\tTue, 19 May 2020 12:47:36 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 19 May 2020 14:50:50 +0200","Message-Id":"<20200519125050.256010-1-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.26.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] include: linux: Update v4l2-controls.h","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 19 May 2020 12:47:37 -0000"},"content":"Update include/linux/v4l2-controls.h with the latest version from the\nLinux kernel media tree master.\n\nThe most notable update is the definition of the V4L2_CID_ORIENTATION\ncontrol that replaces the downstream V4L2_CID_LOCATION.\n\nThe here copied version is not a 1-to-1 copy of the kernel exported\nheader , because of this conflicting definition\n\n< /* The base for the bcm2835-isp driver controls.\n< * We reserve 16 controls for this driver. */\n< #define V4L2_CID_USER_BCM2835_ISP_BASE\t\t(V4L2_CID_USER_BASE + 0x10c0)\n> /*\n> * The base for the atmel isc driver controls.\n> * We reserve 32 controls for this driver.\n> */\n> #define V4L2_CID_USER_ATMEL_ISC_BASE\t\t(V4L2_CID_USER_BASE + 0x10c0)\n\nIn order to keep the RPi pipeline working, keep the downstream\nV4L2_CID_USER_BCM2835_ISP_BASE definition and post-pone the inclusion\nof V4L2_CID_USER_ATMEL_ISC_BASE, which is not used by libcamera.\n\nSigned-off-by: Jacopo Mondi \n---\n include/linux/v4l2-controls.h | 26 ++++++++++----------------\n 1 file changed, 10 insertions(+), 16 deletions(-)\n\n--\n2.26.2","diff":"diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\nindex 171351aee6fc..ffa0d74dd195 100644\n--- a/include/linux/v4l2-controls.h\n+++ b/include/linux/v4l2-controls.h\n@@ -469,6 +469,10 @@ enum v4l2_mpeg_video_h264_level {\n \tV4L2_MPEG_VIDEO_H264_LEVEL_4_2\t= 13,\n \tV4L2_MPEG_VIDEO_H264_LEVEL_5_0\t= 14,\n \tV4L2_MPEG_VIDEO_H264_LEVEL_5_1\t= 15,\n+\tV4L2_MPEG_VIDEO_H264_LEVEL_5_2\t= 16,\n+\tV4L2_MPEG_VIDEO_H264_LEVEL_6_0\t= 17,\n+\tV4L2_MPEG_VIDEO_H264_LEVEL_6_1\t= 18,\n+\tV4L2_MPEG_VIDEO_H264_LEVEL_6_2\t= 19,\n };\n #define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_ALPHA\t(V4L2_CID_MPEG_BASE+360)\n #define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA\t(V4L2_CID_MPEG_BASE+361)\n@@ -497,6 +501,7 @@ enum v4l2_mpeg_video_h264_profile {\n \tV4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA\t= 14,\n \tV4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH\t\t= 15,\n \tV4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH\t\t= 16,\n+\tV4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH\t\t= 17,\n };\n #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT\t(V4L2_CID_MPEG_BASE+364)\n #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH\t(V4L2_CID_MPEG_BASE+365)\n@@ -914,22 +919,10 @@ enum v4l2_auto_focus_range {\n #define V4L2_CID_PAN_SPEED\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+32)\n #define V4L2_CID_TILT_SPEED\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+33)\n\n-/*\n- * This version of the v4l2-controls.h header part of the libcamera sources has\n- * deviated from the version distributed by the mainline Linux kernel.\n- *\n- * Specifically, this version includes temporary definitions of a few custom\n- * controls (V4L2_CID_CAMERA_SENSOR_ROTATION and\n- * V4L2_CID_CAMERA_SENSOR_LOCATION) which have not yet made their way to\n- * upstream Linux.\n- *\n- * When updating this header with a more recent version, make sure the new\n- * version has those additional controls defined.\n- */\n-#define V4L2_CID_CAMERA_SENSOR_LOCATION\t\t(V4L2_CID_CAMERA_CLASS_BASE+34)\n-#define V4L2_LOCATION_FRONT\t\t\t0\n-#define V4L2_LOCATION_BACK\t\t\t1\n-#define V4L2_LOCATION_EXTERNAL\t\t\t2\n+#define V4L2_CID_CAMERA_ORIENTATION\t\t(V4L2_CID_CAMERA_CLASS_BASE+34)\n+#define V4L2_CAMERA_ORIENTATION_FRONT\t\t0\n+#define V4L2_CAMERA_ORIENTATION_BACK\t\t1\n+#define V4L2_CAMERA_ORIENTATION_EXTERNAL\t2\n\n #define V4L2_CID_CAMERA_SENSOR_ROTATION\t\t(V4L2_CID_CAMERA_CLASS_BASE+35)\n\n@@ -1055,6 +1048,7 @@ enum v4l2_jpeg_chroma_subsampling {\n #define V4L2_CID_TEST_PATTERN_GREENR\t\t(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5)\n #define V4L2_CID_TEST_PATTERN_BLUE\t\t(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6)\n #define V4L2_CID_TEST_PATTERN_GREENB\t\t(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7)\n+#define V4L2_CID_UNIT_CELL_SIZE\t\t\t(V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 8)\n\n\n /* Image processing controls */\n","prefixes":["libcamera-devel"]}