{"id":3825,"url":"https://patchwork.libcamera.org/api/1.1/patches/3825/?format=json","web_url":"https://patchwork.libcamera.org/patch/3825/","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":"<20200520100320.436430-1-jacopo@jmondi.org>","date":"2020-05-20T10:03:19","name":"[libcamera-devel,v2,1/2] include: linux: Update v4l2 ctrls for properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"67e3959ca8418321c2654a56badc59dd4f99c771","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/3825/mbox/","series":[{"id":916,"url":"https://patchwork.libcamera.org/api/1.1/series/916/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=916","date":"2020-05-20T10:03:19","name":"[libcamera-devel,v2,1/2] include: linux: Update v4l2 ctrls for properties","version":2,"mbox":"https://patchwork.libcamera.org/series/916/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3825/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3825/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CC795603F3\n\tfor ;\n\tWed, 20 May 2020 12:00:04 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 3D159C0010;\n\tWed, 20 May 2020 10:00:03 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 20 May 2020 12:03:19 +0200","Message-Id":"<20200520100320.436430-1-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.26.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 1/2] include: linux: Update v4l2 ctrls\n\tfor properties","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":"Wed, 20 May 2020 10:00:05 -0000"},"content":"The version of the v4l2-controls.h header file shipped by libcamera had\nslightly deviated from the upstream one, as it included definitions for\nv4l2 controls that report camera properties, which were not acceppted\nupstream at the time the header file was updated.\n\nNow that the controls definition has been accepted in the master branch\nof the linux-media kernel tree, update include/linux/v4l2-controls.h with\nthe upstream-accepted definition of the control ids that describe camera\nproperties.\n\nThe control definition has been imported from the Linux kernel header\nfiles generated from the most recent linux-media master branch, at\nrevision\nad3a44cbd1b2e (\"media: i2c: imx219: Parse and register properties\")\n\nInstead of updating the whole header, just update the definition of V4L2\ncontrols that describe camera properties. A full header update will be\nperformed at the next available linux-media release candidate.\n\nSigned-off-by: Jacopo Mondi \n---\n include/linux/v4l2-controls.h | 20 ++++----------------\n 1 file changed, 4 insertions(+), 16 deletions(-)","diff":"diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\nindex 171351aee6fc..24eea2b69a86 100644\n--- a/include/linux/v4l2-controls.h\n+++ b/include/linux/v4l2-controls.h\n@@ -914,22 +914,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","prefixes":["libcamera-devel","v2","1/2"]}