[{"id":4852,"web_url":"https://patchwork.libcamera.org/comment/4852/","msgid":"<20200519135245.GB3820@pendragon.ideasonboard.com>","date":"2020-05-19T13:52:45","subject":"Re: [libcamera-devel] [PATCH] include: linux: Update v4l2-controls.h","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Tue, May 19, 2020 at 02:50:50PM +0200, Jacopo Mondi wrote:\n> Update include/linux/v4l2-controls.h with the latest version from the\n> Linux kernel media tree master.\n\nCould you please mention the commit ID ?\n\nInstead of pulling a random commit ID, one option would be to only\nreplace the control macros we need, similarly to what we did in\n972bb30c4b2fdd50f8fc02683130fd45b0d793f6, and then update to v5.8 when\nit will be released (or most likely v5.8-rc1 already to avoid delays).\n\n> The most notable update is the definition of the V4L2_CID_ORIENTATION\n> control that replaces the downstream V4L2_CID_LOCATION.\n> \n> The here copied version is not a 1-to-1 copy of the kernel exported\n> header , 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> \n> In order to keep the RPi pipeline working, keep the downstream\n> V4L2_CID_USER_BCM2835_ISP_BASE definition and post-pone the inclusion\n> of V4L2_CID_USER_ATMEL_ISC_BASE, which is not used by libcamera.\n> \n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  include/linux/v4l2-controls.h | 26 ++++++++++----------------\n>  1 file changed, 10 insertions(+), 16 deletions(-)\n> \n> diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\n> index 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 */","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C69DA603D9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 15:52:57 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B274530C;\n\tTue, 19 May 2020 15:52:56 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"HZu8kSj1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589896377;\n\tbh=3KreRTSg23RL+7QZIFPdy/EydifLtUVNyFOwVY7DV2o=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=HZu8kSj1n/qqBetxqzGG1Sw37cyCM+NW2fYzR1xp5euW9KpfA5cOAgF4drHYub+FI\n\t9Cp7FDkjh6zB631ZIbq4ba4XT5ULZKja7aZ1m6kWbD93UkUhKUSTBIwksl+VW9ypep\n\tX1ERLie/au3UzCd6PL/KCBMn7Jwf2/ZdIH7uTXd0=","Date":"Tue, 19 May 2020 16:52:45 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200519135245.GB3820@pendragon.ideasonboard.com>","References":"<20200519125050.256010-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200519125050.256010-1-jacopo@jmondi.org>","Subject":"Re: [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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 19 May 2020 13:52:58 -0000"}},{"id":4858,"web_url":"https://patchwork.libcamera.org/comment/4858/","msgid":"<20200519141908.nwr4igxo7mriu7cn@uno.localdomain>","date":"2020-05-19T14:19:08","subject":"Re: [libcamera-devel] [PATCH] include: linux: Update v4l2-controls.h","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Tue, May 19, 2020 at 04:52:45PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> Thank you for the patch.\n>\n> On Tue, May 19, 2020 at 02:50:50PM +0200, Jacopo Mondi wrote:\n> > Update include/linux/v4l2-controls.h with the latest version from the\n> > Linux kernel media tree master.\n>\n> Could you please mention the commit ID ?\n>\n> Instead of pulling a random commit ID, one option would be to only\n> replace the control macros we need, similarly to what we did in\n> 972bb30c4b2fdd50f8fc02683130fd45b0d793f6, and then update to v5.8 when\n> it will be released (or most likely v5.8-rc1 already to avoid delays).\n\nThat would work as well, as I only need to replace LOCATION with\nORIENTATION. If that's ok, I'll re-send updating the header and the\ncontrol parsing routines to use ORIENTATIOn\n\nThanks\n  j\n\n>\n> > The most notable update is the definition of the V4L2_CID_ORIENTATION\n> > control that replaces the downstream V4L2_CID_LOCATION.\n> >\n> > The here copied version is not a 1-to-1 copy of the kernel exported\n> > header , 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> >\n> > In order to keep the RPi pipeline working, keep the downstream\n> > V4L2_CID_USER_BCM2835_ISP_BASE definition and post-pone the inclusion\n> > of V4L2_CID_USER_ATMEL_ISC_BASE, which is not used by libcamera.\n> >\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  include/linux/v4l2-controls.h | 26 ++++++++++----------------\n> >  1 file changed, 10 insertions(+), 16 deletions(-)\n> >\n> > diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\n> > index 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>\n> --\n> Regards,\n>\n> Laurent Pinchart","headers":{"Return-Path":"<jacopo@jmondi.org>","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 8DFCE603D9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 16:15:50 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay6-d.mail.gandi.net (Postfix) with ESMTPSA id C1D51C0009;\n\tTue, 19 May 2020 14:15:49 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Tue, 19 May 2020 16:19:08 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200519141908.nwr4igxo7mriu7cn@uno.localdomain>","References":"<20200519125050.256010-1-jacopo@jmondi.org>\n\t<20200519135245.GB3820@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200519135245.GB3820@pendragon.ideasonboard.com>","Subject":"Re: [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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 19 May 2020 14:15:50 -0000"}},{"id":4862,"web_url":"https://patchwork.libcamera.org/comment/4862/","msgid":"<20200519143107.GE3820@pendragon.ideasonboard.com>","date":"2020-05-19T14:31:07","subject":"Re: [libcamera-devel] [PATCH] include: linux: Update v4l2-controls.h","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn Tue, May 19, 2020 at 04:19:08PM +0200, Jacopo Mondi wrote:\n> On Tue, May 19, 2020 at 04:52:45PM +0300, Laurent Pinchart wrote:\n> > On Tue, May 19, 2020 at 02:50:50PM +0200, Jacopo Mondi wrote:\n> > > Update include/linux/v4l2-controls.h with the latest version from the\n> > > Linux kernel media tree master.\n> >\n> > Could you please mention the commit ID ?\n> >\n> > Instead of pulling a random commit ID, one option would be to only\n> > replace the control macros we need, similarly to what we did in\n> > 972bb30c4b2fdd50f8fc02683130fd45b0d793f6, and then update to v5.8 when\n> > it will be released (or most likely v5.8-rc1 already to avoid delays).\n> \n> That would work as well, as I only need to replace LOCATION with\n> ORIENTATION. If that's ok, I'll re-send updating the header and the\n> control parsing routines to use ORIENTATIOn\n\nI think I would prefer that, and then doing a larger update from\nv5.8(-rcx).\n\n> > > The most notable update is the definition of the V4L2_CID_ORIENTATION\n> > > control that replaces the downstream V4L2_CID_LOCATION.\n> > >\n> > > The here copied version is not a 1-to-1 copy of the kernel exported\n> > > header , 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> > >\n> > > In order to keep the RPi pipeline working, keep the downstream\n> > > V4L2_CID_USER_BCM2835_ISP_BASE definition and post-pone the inclusion\n> > > of V4L2_CID_USER_ATMEL_ISC_BASE, which is not used by libcamera.\n> > >\n> > > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > > ---\n> > >  include/linux/v4l2-controls.h | 26 ++++++++++----------------\n> > >  1 file changed, 10 insertions(+), 16 deletions(-)\n> > >\n> > > diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\n> > > index 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 */","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A094603DE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 16:31:18 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 316FA30C;\n\tTue, 19 May 2020 16:31:18 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Tkq8i9hG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589898678;\n\tbh=zOXtAaakSRz7rpY33KogiEWnLDpBJ+dpSZG5au01ZRA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Tkq8i9hGIkX8xPzBWUzBoM0NnFUQx+V7MJw5sx1927+L36VUlMrNj6QwVivyiwxte\n\t/uP43oLqhSeBFtqkkTwfn7I9zKUwUWUw6SSljvv7YJvypcAjiDStM3fvflAXXlSlvi\n\tZDOQKiFM4IQ061OzVkMFp79eFphEl6NShpLyfKNg=","Date":"Tue, 19 May 2020 17:31:07 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200519143107.GE3820@pendragon.ideasonboard.com>","References":"<20200519125050.256010-1-jacopo@jmondi.org>\n\t<20200519135245.GB3820@pendragon.ideasonboard.com>\n\t<20200519141908.nwr4igxo7mriu7cn@uno.localdomain>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200519141908.nwr4igxo7mriu7cn@uno.localdomain>","Subject":"Re: [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":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Tue, 19 May 2020 14:31:18 -0000"}}]