[{"id":4018,"web_url":"https://patchwork.libcamera.org/comment/4018/","msgid":"<20200316064430.GG4732@pendragon.ideasonboard.com>","date":"2020-03-16T06:44:30","subject":"Re: [libcamera-devel] [PATCH 2/4] libcamera: v4l2_videodevice:\n\tRemove usage of ImageFormats","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Mon, Mar 16, 2020 at 03:40:34AM +0100, Niklas Söderlund wrote:\n> The ImageFormats class is not very nice as it forces the pixel format to\n> be an unsigned integer. Replace it with a map of PixelFormat to vector\n> of sizes.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> src/libcamera/include/v4l2_videodevice.h | 2 +-\n> src/libcamera/pipeline/uvcvideo.cpp | 3 +--\n> src/libcamera/v4l2_videodevice.cpp | 11 +++--------\n> 3 files changed, 5 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n> index 2507daf23efac66f..38dfd92544fa2c0e 100644\n> --- a/src/libcamera/include/v4l2_videodevice.h\n> +++ b/src/libcamera/include/v4l2_videodevice.h\n> @@ -184,7 +184,7 @@ public:\n> \n> \tint getFormat(V4L2DeviceFormat *format);\n> \tint setFormat(V4L2DeviceFormat *format);\n> -\tImageFormats formats();\n> +\tstd::map> formats();\n\nThis should be a map of unsigned int to std::vector, as we're\ndealing with V4L2 4CCs here. I would introduce a V4L2PixelFormat class\nto model the V4L2 4CCs, to avoid confusion.\n\n> \n> \tint setCrop(Rectangle *rect);\n> \tint setCompose(Rectangle *rect);\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 320da2685795c041..b5f98a96a14fe348 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -153,8 +153,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n> \tif (roles.empty())\n> \t\treturn config;\n> \n> -\tImageFormats v4l2formats = data->video_->formats();\n> -\tStreamFormats formats(v4l2formats.data());\n> +\tStreamFormats formats(data->video_->formats());\n> \tStreamConfiguration cfg(formats);\n> \n> \tcfg.pixelFormat = formats.pixelformats().front();\n> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> index 858310c3b810350a..f9c59d5e3fb65737 100644\n> --- a/src/libcamera/v4l2_videodevice.cpp\n> +++ b/src/libcamera/v4l2_videodevice.cpp\n> @@ -901,21 +901,16 @@ int V4L2VideoDevice::setFormatSingleplane(V4L2DeviceFormat *format)\n> *\n> * \\return A list of the supported video device formats\n> */\n> -ImageFormats V4L2VideoDevice::formats()\n> +std::map> V4L2VideoDevice::formats()\n> {\n> -\tImageFormats formats;\n> +\tstd::map> formats;\n> \n> \tfor (unsigned int pixelformat : enumPixelformats()) {\n> \t\tstd::vector sizes = enumSizes(pixelformat);\n> \t\tif (sizes.empty())\n> \t\t\treturn {};\n> \n> -\t\tif (formats.addFormat(pixelformat, sizes)) {\n> -\t\t\tLOG(V4L2, Error)\n> -\t\t\t\t<< \"Could not add sizes for pixel format \"\n> -\t\t\t\t<< pixelformat;\n> -\t\t\treturn {};\n> -\t\t}\n> +\t\tformats[pixelformat] = sizes;\n> \t}\n> \n> \treturn formats;","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 B9CE860417\n\tfor ;\n\tMon, 16 Mar 2020 07:44:36 +0100 (CET)","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 C65AE2D6;\n\tMon, 16 Mar 2020 07:44:35 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584341076;\n\tbh=KRDWs5e+ZMjh3ONDfmc3Xer+VkxukKins3LM7l1/p7E=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=lNz6hUJ23IE2LA2zSEW+BgYaP2MxFdL0Hw4SnXm0AZvWHQtXq/bWj3ipy4BixchuS\n\tC7JsRsoXAi1R31qXufjn8JrghmyhDlZYqmHTDUrXwvOUR537GoFazeXVjsmeDbSQg1\n\tvS0GVhNLl8pIHAFl04NhBmFIe7dQOjBx+xKC3Q0s=","Date":"Mon, 16 Mar 2020 08:44:30 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200316064430.GG4732@pendragon.ideasonboard.com>","References":"<20200316024036.2474307-1-niklas.soderlund@ragnatech.se>\n\t<20200316024036.2474307-3-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20200316024036.2474307-3-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 2/4] libcamera: v4l2_videodevice:\n\tRemove usage of ImageFormats","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, 16 Mar 2020 06:44:36 -0000"}}]