[{"id":2931,"web_url":"https://patchwork.libcamera.org/comment/2931/","msgid":"<20191020052325.GB4991@pendragon.ideasonboard.com>","date":"2019-10-20T05:23:25","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Fri, Oct 18, 2019 at 04:42:00PM +0100, Kieran Bingham wrote:\n> The use of either single planar or multi planar API is constant\n> throughout the usage of a device, based upon the buffer type of the\n> stream, and once determined it does not change.\n> \n> Rather than interrogate the bufferType_ each time, set a device flag at\n> open() time as to whether we are using planar or multi-planar buffer\n> APIs.\n> \n> Signed-off-by: Kieran Bingham \n> ---\n> src/libcamera/include/v4l2_videodevice.h | 1 +\n> src/libcamera/v4l2_videodevice.cpp | 13 ++++++++-----\n> 2 files changed, 9 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n> index 4b8cf9394eb9..60fca01670c6 100644\n> --- a/src/libcamera/include/v4l2_videodevice.h\n> +++ b/src/libcamera/include/v4l2_videodevice.h\n> @@ -182,6 +182,7 @@ private:\n> \n> \tenum v4l2_buf_type bufferType_;\n> \tenum v4l2_memory memoryType_;\n> +\tbool multiPlanar_;\n\nI'm not really opposed to this, but does this change really add value to\noffset for the larger memory usage ? That's of course a bit of a\nrhetorical question as one bool isn't much :-)\n\nIf we decide to move forward, how should the method below react when\npassing a buf.type that doesn't match multiPlanar_ ? Currently the\nkernel will return an error, is it a good idea to ignore the issue\nsilently ?\n\n> \n> \tBufferPool *bufferPool_;\n> \tstd::map queuedBuffers_;\n> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> index 208ab54199b1..37f61b90ac46 100644\n> --- a/src/libcamera/v4l2_videodevice.cpp\n> +++ b/src/libcamera/v4l2_videodevice.cpp\n> @@ -350,6 +350,8 @@ int V4L2VideoDevice::open()\n> \t\treturn -EINVAL;\n> \t}\n> \n> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n> +\n> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n> \tfdEvent_->setEnabled(false);\n> \n> @@ -436,6 +438,8 @@ int V4L2VideoDevice::open(int handle, enum v4l2_buf_type type)\n> \t\treturn -EINVAL;\n> \t}\n> \n> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n> +\n> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n> \tfdEvent_->setEnabled(false);\n> \n> @@ -870,7 +874,7 @@ int V4L2VideoDevice::exportBuffers(BufferPool *pool)\n> \t\t\tbreak;\n> \t\t}\n> \n> -\t\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n> +\t\tif (multiPlanar_) {\n> \t\t\tfor (unsigned int p = 0; p < buf.length; ++p) {\n> \t\t\t\tret = createPlane(&buffer, i, p,\n> \t\t\t\t\t\t buf.m.planes[p].length);\n> @@ -993,12 +997,11 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n> \tbuf.memory = memoryType_;\n> \tbuf.field = V4L2_FIELD_NONE;\n> \n> -\tbool multiPlanar = V4L2_TYPE_IS_MULTIPLANAR(buf.type);\n> \tBufferMemory *mem = &bufferPool_->buffers()[buf.index];\n> \tconst std::vector &planes = mem->planes();\n> \n> \tif (buf.memory == V4L2_MEMORY_DMABUF) {\n> -\t\tif (multiPlanar) {\n> +\t\tif (multiPlanar_) {\n> \t\t\tfor (unsigned int p = 0; p < planes.size(); ++p)\n> \t\t\t\tv4l2Planes[p].m.fd = planes[p].dmabuf();\n> \t\t} else {\n> @@ -1006,7 +1009,7 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n> \t\t}\n> \t}\n> \n> -\tif (multiPlanar) {\n> +\tif (multiPlanar_) {\n> \t\tbuf.length = planes.size();\n> \t\tbuf.m.planes = v4l2Planes;\n> \t}\n> @@ -1099,7 +1102,7 @@ Buffer *V4L2VideoDevice::dequeueBuffer()\n> \tbuf.type = bufferType_;\n> \tbuf.memory = memoryType_;\n> \n> -\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n> +\tif (multiPlanar_) {\n> \t\tbuf.length = VIDEO_MAX_PLANES;\n> \t\tbuf.m.planes = planes;\n> \t}","headers":{"Return-Path":"","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 D206D60C0F\n\tfor ;\n\tSun, 20 Oct 2019 07:23:31 +0200 (CEST)","from pendragon.ideasonboard.com (unknown [185.67.82.67])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 25E0DA2C;\n\tSun, 20 Oct 2019 07:23:31 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1571549011;\n\tbh=p5IInlv0K7cN35oY5mXUgyJcXjSWXpAN0Kz+UHU5cJM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gV1bIscMlg3t0yY2/LAIUwx1LiUl9P5dCflj2egnkVHqu8oBVrAIPxNR5JzZPgUp6\n\ttqTzG9bel4LlIfMUIgzenjFcLQXtYvLY7D7bOK5D/OzjzOnYXwbtKSCHZYkMRZPLXM\n\te7t7UWGl/oo1GdvX2KsjXL63ocqYdZysqX94PhEA=","Date":"Sun, 20 Oct 2019 08:23:25 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20191020052325.GB4991@pendragon.ideasonboard.com>","References":"<20191018154201.13540-1-kieran.bingham@ideasonboard.com>\n\t<20191018154201.13540-2-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20191018154201.13540-2-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","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":"Sun, 20 Oct 2019 05:23:32 -0000"}},{"id":2935,"web_url":"https://patchwork.libcamera.org/comment/2935/","msgid":"<38a1ba68-727d-98c2-4e9a-98f3c0635a75@ideasonboard.com>","date":"2019-10-21T10:40:24","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 20/10/2019 06:23, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Fri, Oct 18, 2019 at 04:42:00PM +0100, Kieran Bingham wrote:\n>> The use of either single planar or multi planar API is constant\n>> throughout the usage of a device, based upon the buffer type of the\n>> stream, and once determined it does not change.\n>>\n>> Rather than interrogate the bufferType_ each time, set a device flag at\n>> open() time as to whether we are using planar or multi-planar buffer\n>> APIs.\n>>\n>> Signed-off-by: Kieran Bingham \n>> ---\n>> src/libcamera/include/v4l2_videodevice.h | 1 +\n>> src/libcamera/v4l2_videodevice.cpp | 13 ++++++++-----\n>> 2 files changed, 9 insertions(+), 5 deletions(-)\n>>\n>> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n>> index 4b8cf9394eb9..60fca01670c6 100644\n>> --- a/src/libcamera/include/v4l2_videodevice.h\n>> +++ b/src/libcamera/include/v4l2_videodevice.h\n>> @@ -182,6 +182,7 @@ private:\n>> \n>> \tenum v4l2_buf_type bufferType_;\n>> \tenum v4l2_memory memoryType_;\n>> +\tbool multiPlanar_;\n> \n> I'm not really opposed to this, but does this change really add value to\n> offset for the larger memory usage ? That's of course a bit of a\n> rhetorical question as one bool isn't much :-)\n\nYes, I wasn't too worried about the single bool.\n\n\n> If we decide to move forward, how should the method below react when\n> passing a buf.type that doesn't match multiPlanar_ ? Currently the\n> kernel will return an error, is it a good idea to ignore the issue\n> silently ?\n\nUgh, I hadn't considered that someone could give us a single planar\nbuffer if we are configured in multiplanar.\n\nThat would indeed indicate someone had screwed up - so we shouldn't\nleave it to go silent.\n\nMy main reason for this was that I later add another point of having to\nsplit code path for mplane/splane - and I felt having a single variable\nwould make this clearer/simplified.\n\n\n\n>> \tBufferPool *bufferPool_;\n>> \tstd::map queuedBuffers_;\n>> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n>> index 208ab54199b1..37f61b90ac46 100644\n>> --- a/src/libcamera/v4l2_videodevice.cpp\n>> +++ b/src/libcamera/v4l2_videodevice.cpp\n>> @@ -350,6 +350,8 @@ int V4L2VideoDevice::open()\n>> \t\treturn -EINVAL;\n>> \t}\n>> \n>> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n>> +\n>> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n>> \tfdEvent_->setEnabled(false);\n>> \n>> @@ -436,6 +438,8 @@ int V4L2VideoDevice::open(int handle, enum v4l2_buf_type type)\n>> \t\treturn -EINVAL;\n>> \t}\n>> \n>> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n>> +\n>> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n>> \tfdEvent_->setEnabled(false);\n>> \n>> @@ -870,7 +874,7 @@ int V4L2VideoDevice::exportBuffers(BufferPool *pool)\n>> \t\t\tbreak;\n>> \t\t}\n>> \n>> -\t\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n>> +\t\tif (multiPlanar_) {\n>> \t\t\tfor (unsigned int p = 0; p < buf.length; ++p) {\n>> \t\t\t\tret = createPlane(&buffer, i, p,\n>> \t\t\t\t\t\t buf.m.planes[p].length);\n>> @@ -993,12 +997,11 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n>> \tbuf.memory = memoryType_;\n>> \tbuf.field = V4L2_FIELD_NONE;\n>> \n>> -\tbool multiPlanar = V4L2_TYPE_IS_MULTIPLANAR(buf.type);\n>> \tBufferMemory *mem = &bufferPool_->buffers()[buf.index];\n>> \tconst std::vector &planes = mem->planes();\n>> \n>> \tif (buf.memory == V4L2_MEMORY_DMABUF) {\n>> -\t\tif (multiPlanar) {\n>> +\t\tif (multiPlanar_) {\n>> \t\t\tfor (unsigned int p = 0; p < planes.size(); ++p)\n>> \t\t\t\tv4l2Planes[p].m.fd = planes[p].dmabuf();\n>> \t\t} else {\n>> @@ -1006,7 +1009,7 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n>> \t\t}\n>> \t}\n>> \n>> -\tif (multiPlanar) {\n>> +\tif (multiPlanar_) {\n>> \t\tbuf.length = planes.size();\n>> \t\tbuf.m.planes = v4l2Planes;\n>> \t}\n>> @@ -1099,7 +1102,7 @@ Buffer *V4L2VideoDevice::dequeueBuffer()\n>> \tbuf.type = bufferType_;\n>> \tbuf.memory = memoryType_;\n>> \n>> -\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n>> +\tif (multiPlanar_) {\n>> \t\tbuf.length = VIDEO_MAX_PLANES;\n>> \t\tbuf.m.planes = planes;\n>> \t}\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1B70060BE0\n\tfor ;\n\tMon, 21 Oct 2019 12:40:28 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8FB1E540;\n\tMon, 21 Oct 2019 12:40:27 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1571654427;\n\tbh=6mxt8unZnCmBfzHBzee77695cU23jX48558HbNV5hTU=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=GVGgjhyzv0r+ZSA1h9eoXDItjk4X+BfpCqshW4YLP3Ehj+W+dmfXlivIkqdWJzApX\n\tpMtJy7yuyVsNQXOpy2WVS090fjkwXPgcwyQsCVqmRk6DtR4mC+fjUXPbdlesJZHY9l\n\tXRCI2pcuL/X7+2Zjd4WN5B2tHD/Pjmmm7wXJhLzY=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"LibCamera Devel ","References":"<20191018154201.13540-1-kieran.bingham@ideasonboard.com>\n\t<20191018154201.13540-2-kieran.bingham@ideasonboard.com>\n\t<20191020052325.GB4991@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<38a1ba68-727d-98c2-4e9a-98f3c0635a75@ideasonboard.com>","Date":"Mon, 21 Oct 2019 11:40:24 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.8.0","MIME-Version":"1.0","In-Reply-To":"<20191020052325.GB4991@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","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":"Mon, 21 Oct 2019 10:40:28 -0000"}},{"id":2956,"web_url":"https://patchwork.libcamera.org/comment/2956/","msgid":"<20191023151153.GF1904@pendragon.ideasonboard.com>","date":"2019-10-23T15:11:53","subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Oct 21, 2019 at 11:40:24AM +0100, Kieran Bingham wrote:\n> On 20/10/2019 06:23, Laurent Pinchart wrote:\n> > On Fri, Oct 18, 2019 at 04:42:00PM +0100, Kieran Bingham wrote:\n> >> The use of either single planar or multi planar API is constant\n> >> throughout the usage of a device, based upon the buffer type of the\n> >> stream, and once determined it does not change.\n> >>\n> >> Rather than interrogate the bufferType_ each time, set a device flag at\n> >> open() time as to whether we are using planar or multi-planar buffer\n> >> APIs.\n> >>\n> >> Signed-off-by: Kieran Bingham \n> >> ---\n> >> src/libcamera/include/v4l2_videodevice.h | 1 +\n> >> src/libcamera/v4l2_videodevice.cpp | 13 ++++++++-----\n> >> 2 files changed, 9 insertions(+), 5 deletions(-)\n> >>\n> >> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n> >> index 4b8cf9394eb9..60fca01670c6 100644\n> >> --- a/src/libcamera/include/v4l2_videodevice.h\n> >> +++ b/src/libcamera/include/v4l2_videodevice.h\n> >> @@ -182,6 +182,7 @@ private:\n> >> \n> >> \tenum v4l2_buf_type bufferType_;\n> >> \tenum v4l2_memory memoryType_;\n> >> +\tbool multiPlanar_;\n> > \n> > I'm not really opposed to this, but does this change really add value to\n> > offset for the larger memory usage ? That's of course a bit of a\n> > rhetorical question as one bool isn't much :-)\n> \n> Yes, I wasn't too worried about the single bool.\n> \n> > If we decide to move forward, how should the method below react when\n> > passing a buf.type that doesn't match multiPlanar_ ? Currently the\n> > kernel will return an error, is it a good idea to ignore the issue\n> > silently ?\n> \n> Ugh, I hadn't considered that someone could give us a single planar\n> buffer if we are configured in multiplanar.\n> \n> That would indeed indicate someone had screwed up - so we shouldn't\n> leave it to go silent.\n\nOr we could improve the API by making the error impossible to trigger,\nbut that would require creating a custom structure that duplicates\nv4l2_buffer without the type. I don't think that's worth it.\n\nAnother option is to ignore buf.type everywhere, using bufferType_\nunconditionally, and remove all code that sets it manually.\n\n> My main reason for this was that I later add another point of having to\n> split code path for mplane/splane - and I felt having a single variable\n> would make this clearer/simplified.\n> \n> >> \tBufferPool *bufferPool_;\n> >> \tstd::map queuedBuffers_;\n> >> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> >> index 208ab54199b1..37f61b90ac46 100644\n> >> --- a/src/libcamera/v4l2_videodevice.cpp\n> >> +++ b/src/libcamera/v4l2_videodevice.cpp\n> >> @@ -350,6 +350,8 @@ int V4L2VideoDevice::open()\n> >> \t\treturn -EINVAL;\n> >> \t}\n> >> \n> >> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n> >> +\n> >> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n> >> \tfdEvent_->setEnabled(false);\n> >> \n> >> @@ -436,6 +438,8 @@ int V4L2VideoDevice::open(int handle, enum v4l2_buf_type type)\n> >> \t\treturn -EINVAL;\n> >> \t}\n> >> \n> >> +\tmultiPlanar_ = V4L2_TYPE_IS_MULTIPLANAR(bufferType_);\n> >> +\n> >> \tfdEvent_->activated.connect(this, &V4L2VideoDevice::bufferAvailable);\n> >> \tfdEvent_->setEnabled(false);\n> >> \n> >> @@ -870,7 +874,7 @@ int V4L2VideoDevice::exportBuffers(BufferPool *pool)\n> >> \t\t\tbreak;\n> >> \t\t}\n> >> \n> >> -\t\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n> >> +\t\tif (multiPlanar_) {\n> >> \t\t\tfor (unsigned int p = 0; p < buf.length; ++p) {\n> >> \t\t\t\tret = createPlane(&buffer, i, p,\n> >> \t\t\t\t\t\t buf.m.planes[p].length);\n> >> @@ -993,12 +997,11 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n> >> \tbuf.memory = memoryType_;\n> >> \tbuf.field = V4L2_FIELD_NONE;\n> >> \n> >> -\tbool multiPlanar = V4L2_TYPE_IS_MULTIPLANAR(buf.type);\n> >> \tBufferMemory *mem = &bufferPool_->buffers()[buf.index];\n> >> \tconst std::vector &planes = mem->planes();\n> >> \n> >> \tif (buf.memory == V4L2_MEMORY_DMABUF) {\n> >> -\t\tif (multiPlanar) {\n> >> +\t\tif (multiPlanar_) {\n> >> \t\t\tfor (unsigned int p = 0; p < planes.size(); ++p)\n> >> \t\t\t\tv4l2Planes[p].m.fd = planes[p].dmabuf();\n> >> \t\t} else {\n> >> @@ -1006,7 +1009,7 @@ int V4L2VideoDevice::queueBuffer(Buffer *buffer)\n> >> \t\t}\n> >> \t}\n> >> \n> >> -\tif (multiPlanar) {\n> >> +\tif (multiPlanar_) {\n> >> \t\tbuf.length = planes.size();\n> >> \t\tbuf.m.planes = v4l2Planes;\n> >> \t}\n> >> @@ -1099,7 +1102,7 @@ Buffer *V4L2VideoDevice::dequeueBuffer()\n> >> \tbuf.type = bufferType_;\n> >> \tbuf.memory = memoryType_;\n> >> \n> >> -\tif (V4L2_TYPE_IS_MULTIPLANAR(buf.type)) {\n> >> +\tif (multiPlanar_) {\n> >> \t\tbuf.length = VIDEO_MAX_PLANES;\n> >> \t\tbuf.m.planes = planes;\n> >> \t}","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1123260BF7\n\tfor ;\n\tWed, 23 Oct 2019 17:11:59 +0200 (CEST)","from pendragon.ideasonboard.com (143.121.2.93.rev.sfr.net\n\t[93.2.121.143])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 93C3733A;\n\tWed, 23 Oct 2019 17:11:58 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1571843518;\n\tbh=d8860JV4AsB/OlUix8AciIl2Pco88slc2HSxBv1+lPE=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Pjzg4Aa3bArDJZ+LwmSJHGR0lRRcaW4gB95LlMeFwps5S662FSnRVgcujG2XYGq4B\n\tFKAvKlNfw3VyEVEntmz4X6kc7rOcyZ/kU7/yQ4QXBv/c+pPxOxHhblVOYHPiwnvEsH\n\tFkY/YCIhy4ZQE8WbBtEcBPNHiqp4/QfYgw1QiJz4=","Date":"Wed, 23 Oct 2019 18:11:53 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20191023151153.GF1904@pendragon.ideasonboard.com>","References":"<20191018154201.13540-1-kieran.bingham@ideasonboard.com>\n\t<20191018154201.13540-2-kieran.bingham@ideasonboard.com>\n\t<20191020052325.GB4991@pendragon.ideasonboard.com>\n\t<38a1ba68-727d-98c2-4e9a-98f3c0635a75@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<38a1ba68-727d-98c2-4e9a-98f3c0635a75@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 1/2] libcamera: v4l2_videodevice:\n\tNormalise multiPlanar configuration","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, 23 Oct 2019 15:11:59 -0000"}}]