[{"id":4103,"web_url":"https://patchwork.libcamera.org/comment/4103/","msgid":"<20200319150756.h3xg7bsiclulrd6e@uno.localdomain>","date":"2020-03-19T15:07:56","subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: v4l2_videodevice:\n\tRename toV4L2Fourcc to toV4L2PixelFormat","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Thu, Mar 19, 2020 at 03:29:18PM +0200, Laurent Pinchart wrote:\n> Now that the functions return a V4L2PixelFormat, adapt their name\n> accordingly.\n>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n   j\n\n> ---\n>  src/libcamera/include/v4l2_videodevice.h | 6 +++---\n>  src/libcamera/pipeline/ipu3/ipu3.cpp     | 2 +-\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 4 ++--\n>  src/libcamera/pipeline/uvcvideo.cpp      | 4 ++--\n>  src/libcamera/pipeline/vimc.cpp          | 4 ++--\n>  src/libcamera/v4l2_videodevice.cpp       | 8 ++++----\n>  test/libtest/buffer_source.cpp           | 3 ++-\n>  7 files changed, 16 insertions(+), 15 deletions(-)\n>\n> diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\n> index 2a380c0e61cd..5e40c0c57df9 100644\n> --- a/src/libcamera/include/v4l2_videodevice.h\n> +++ b/src/libcamera/include/v4l2_videodevice.h\n> @@ -229,9 +229,9 @@ public:\n>  \t\t\t\t\t       const std::string &entity);\n>\n>  \tstatic PixelFormat toPixelFormat(V4L2PixelFormat v4l2Fourcc);\n> -\tV4L2PixelFormat toV4L2Fourcc(const PixelFormat &pixelFormat);\n> -\tstatic V4L2PixelFormat toV4L2Fourcc(const PixelFormat &pixelFormat,\n> -\t\t\t\t\t    bool multiplanar);\n> +\tV4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat);\n> +\tstatic V4L2PixelFormat toV4L2PixelFormat(const PixelFormat &pixelFormat,\n> +\t\t\t\t\t\t bool multiplanar);\n>\n>  protected:\n>  \tstd::string logPrefix() const;\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 55ce8fa16af1..e9085f2f0c7e 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -1078,7 +1078,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n>  \t\treturn 0;\n>\n>  \tV4L2DeviceFormat outputFormat = {};\n> -\toutputFormat.fourcc = dev->toV4L2Fourcc(PixelFormat(DRM_FORMAT_NV12));\n> +\toutputFormat.fourcc = dev->toV4L2PixelFormat(PixelFormat(DRM_FORMAT_NV12));\n>  \toutputFormat.size = cfg.size;\n>  \toutputFormat.planesCount = 2;\n>\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 737e331459f3..07d837abe1ac 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -626,7 +626,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n>  \tLOG(RkISP1, Debug) << \"Resizer output pad configured with \" << format.toString();\n>\n>  \tV4L2DeviceFormat outputFormat = {};\n> -\toutputFormat.fourcc = video_->toV4L2Fourcc(cfg.pixelFormat);\n> +\toutputFormat.fourcc = video_->toV4L2PixelFormat(cfg.pixelFormat);\n>  \toutputFormat.size = cfg.size;\n>  \toutputFormat.planesCount = 2;\n>\n> @@ -635,7 +635,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n>  \t\treturn ret;\n>\n>  \tif (outputFormat.size != cfg.size ||\n> -\t    outputFormat.fourcc != video_->toV4L2Fourcc(cfg.pixelFormat)) {\n> +\t    outputFormat.fourcc != video_->toV4L2PixelFormat(cfg.pixelFormat)) {\n>  \t\tLOG(RkISP1, Error)\n>  \t\t\t<< \"Unable to configure capture in \" << cfg.toString();\n>  \t\treturn -EINVAL;\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 67750fbc7c0c..15c8baef1a24 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -187,7 +187,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n>  \tint ret;\n>\n>  \tV4L2DeviceFormat format = {};\n> -\tformat.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat);\n> +\tformat.fourcc = data->video_->toV4L2PixelFormat(cfg.pixelFormat);\n>  \tformat.size = cfg.size;\n>\n>  \tret = data->video_->setFormat(&format);\n> @@ -195,7 +195,7 @@ int PipelineHandlerUVC::configure(Camera *camera, CameraConfiguration *config)\n>  \t\treturn ret;\n>\n>  \tif (format.size != cfg.size ||\n> -\t    format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat))\n> +\t    format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat))\n>  \t\treturn -EINVAL;\n>\n>  \tcfg.setStream(&data->stream_);\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index cbf330614bd6..1097eea243a1 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -229,7 +229,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n>  \t\treturn ret;\n>\n>  \tV4L2DeviceFormat format = {};\n> -\tformat.fourcc = data->video_->toV4L2Fourcc(cfg.pixelFormat);\n> +\tformat.fourcc = data->video_->toV4L2PixelFormat(cfg.pixelFormat);\n>  \tformat.size = cfg.size;\n>\n>  \tret = data->video_->setFormat(&format);\n> @@ -237,7 +237,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n>  \t\treturn ret;\n>\n>  \tif (format.size != cfg.size ||\n> -\t    format.fourcc != data->video_->toV4L2Fourcc(cfg.pixelFormat))\n> +\t    format.fourcc != data->video_->toV4L2PixelFormat(cfg.pixelFormat))\n>  \t\treturn -EINVAL;\n>\n>  \t/*\n> diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\n> index 1c60014caa6f..496bc56b6f89 100644\n> --- a/src/libcamera/v4l2_videodevice.cpp\n> +++ b/src/libcamera/v4l2_videodevice.cpp\n> @@ -1689,9 +1689,9 @@ PixelFormat V4L2VideoDevice::toPixelFormat(V4L2PixelFormat v4l2Fourcc)\n>   *\n>   * \\return The V4L2_PIX_FMT_* pixel format code corresponding to \\a pixelFormat\n>   */\n> -V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat)\n> +V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat)\n>  {\n> -\treturn V4L2VideoDevice::toV4L2Fourcc(pixelFormat, caps_.isMultiplanar());\n> +\treturn toV4L2PixelFormat(pixelFormat, caps_.isMultiplanar());\n>  }\n>\n>  /**\n> @@ -1707,8 +1707,8 @@ V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat)\n>   *\n>   * \\return The V4L2_PIX_FMT_* pixel format code corresponding to \\a pixelFormat\n>   */\n> -V4L2PixelFormat V4L2VideoDevice::toV4L2Fourcc(const PixelFormat &pixelFormat,\n> -\t\t\t\t\t      bool multiplanar)\n> +V4L2PixelFormat V4L2VideoDevice::toV4L2PixelFormat(const PixelFormat &pixelFormat,\n> +\t\t\t\t\t\t   bool multiplanar)\n>  {\n>  \tswitch (pixelFormat) {\n>  \t/* RGB formats. */\n> diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp\n> index 26d2764d5f8f..dae3cb9f7a6c 100644\n> --- a/test/libtest/buffer_source.cpp\n> +++ b/test/libtest/buffer_source.cpp\n> @@ -70,7 +70,8 @@ int BufferSource::allocate(const StreamConfiguration &config)\n>  \t}\n>\n>  \tformat.size = config.size;\n> -\tformat.fourcc = V4L2VideoDevice::toV4L2Fourcc(config.pixelFormat, false);\n> +\tformat.fourcc = V4L2VideoDevice::toV4L2PixelFormat(config.pixelFormat,\n> +\t\t\t\t\t\t\t   false);\n>  \tif (video->setFormat(&format)) {\n>  \t\tstd::cout << \"Failed to set format on output device\" << std::endl;\n>  \t\treturn TestFail;\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 083A9629AC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 19 Mar 2020 16:05:01 +0100 (CET)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 76F4E1BF20A;\n\tThu, 19 Mar 2020 15:05:00 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Thu, 19 Mar 2020 16:07:56 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200319150756.h3xg7bsiclulrd6e@uno.localdomain>","References":"<20200319132919.9563-1-laurent.pinchart@ideasonboard.com>\n\t<20200319132919.9563-3-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200319132919.9563-3-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/3] libcamera: v4l2_videodevice:\n\tRename toV4L2Fourcc to toV4L2PixelFormat","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":"Thu, 19 Mar 2020 15:05:01 -0000"}}]