[{"id":745,"web_url":"https://patchwork.libcamera.org/comment/745/","msgid":"<20190201223243.GE4359@pendragon.ideasonboard.com>","date":"2019-02-01T22:32:43","subject":"Re: [libcamera-devel] [PATCH 3/7] libcamera: v4l2_device: Rename\n\tparameters to s/g_fmt","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 Fri, Feb 01, 2019 at 04:42:44PM +0100, Jacopo Mondi wrote:\n> Rename parameters to get and set format functions to expand 'fmt' to\n> 'format'.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/include/v4l2_device.h | 12 ++--\n> src/libcamera/v4l2_device.cpp | 96 ++++++++++++++---------------\n> 2 files changed, 54 insertions(+), 54 deletions(-)\n> \n> diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\n> index 70e3c00..e65a540 100644\n> --- a/src/libcamera/include/v4l2_device.h\n> +++ b/src/libcamera/include/v4l2_device.h\n> @@ -86,15 +86,15 @@ public:\n> \tconst char *deviceName() const { return caps_.card(); }\n> \tconst char *busName() const { return caps_.bus_info(); }\n> \n> -\tint getFormat(V4L2DeviceFormat *fmt);\n> -\tint setFormat(V4L2DeviceFormat *fmt);\n> +\tint getFormat(V4L2DeviceFormat *format);\n> +\tint setFormat(V4L2DeviceFormat *format);\n> \n> private:\n> -\tint getFormatSingleplane(V4L2DeviceFormat *fmt);\n> -\tint setFormatSingleplane(V4L2DeviceFormat *fmt);\n> +\tint getFormatSingleplane(V4L2DeviceFormat *format);\n> +\tint setFormatSingleplane(V4L2DeviceFormat *format);\n> \n> -\tint getFormatMultiplane(V4L2DeviceFormat *fmt);\n> -\tint setFormatMultiplane(V4L2DeviceFormat *fmt);\n> +\tint getFormatMultiplane(V4L2DeviceFormat *format);\n> +\tint setFormatMultiplane(V4L2DeviceFormat *format);\n> \n> \tstd::string deviceNode_;\n> \tint fd_;\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 5ba89b9..8cf566c 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -282,58 +282,58 @@ void V4L2Device::close()\n> * \\brief Retrieve the image format set on the V4L2 device\n> * \\return 0 for success, a negative error code otherwise\n> */\n> -int V4L2Device::getFormat(V4L2DeviceFormat *fmt)\n> +int V4L2Device::getFormat(V4L2DeviceFormat *format)\n> {\n> -\treturn caps_.isMultiplanar() ? getFormatMultiplane(fmt) :\n> -\t\t\t\t getFormatSingleplane(fmt);\n> +\treturn caps_.isMultiplanar() ? getFormatMultiplane(format) :\n> +\t\t\t\t getFormatSingleplane(format);\n> }\n> \n> /**\n> * \\brief Configure an image format on the V4L2 device\n> * \\return 0 for success, a negative error code otherwise\n> */\n> -int V4L2Device::setFormat(V4L2DeviceFormat *fmt)\n> +int V4L2Device::setFormat(V4L2DeviceFormat *format)\n> {\n> -\treturn caps_.isMultiplanar() ? setFormatMultiplane(fmt) :\n> -\t\t\t\t setFormatSingleplane(fmt);\n> +\treturn caps_.isMultiplanar() ? setFormatMultiplane(format) :\n> +\t\t\t\t setFormatSingleplane(format);\n> }\n> \n> -int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *fmt)\n> +int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)\n> {\n> -\tstruct v4l2_format v4l2Fmt;\n> -\tstruct v4l2_pix_format *pix = &v4l2Fmt.fmt.pix;\n> +\tstruct v4l2_format v4l2Format;\n> +\tstruct v4l2_pix_format *pix = &v4l2Format.fmt.pix;\n> \tint ret;\n> \n> -\tv4l2Fmt.type = bufferType_;\n> -\tret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Fmt);\n> +\tv4l2Format.type = bufferType_;\n> +\tret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(Error) << \"Unable to get format: \" << strerror(-ret);\n> \t\treturn ret;\n> \t}\n> \n> -\tfmt->width = pix->width;\n> -\tfmt->height = pix->height;\n> -\tfmt->fourcc = pix->pixelformat;\n> -\tfmt->planes = 1;\n> -\tfmt->planesFmt[0].bpl = pix->bytesperline;\n> -\tfmt->planesFmt[0].size = pix->sizeimage;\n> +\tformat->width = pix->width;\n> +\tformat->height = pix->height;\n> +\tformat->fourcc = pix->pixelformat;\n> +\tformat->planes = 1;\n> +\tformat->planesFmt[0].bpl = pix->bytesperline;\n> +\tformat->planesFmt[0].size = pix->sizeimage;\n> \n> \treturn 0;\n> }\n> \n> -int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *fmt)\n> +int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)\n> {\n> -\tstruct v4l2_format v4l2Fmt;\n> -\tstruct v4l2_pix_format *pix = &v4l2Fmt.fmt.pix;\n> +\tstruct v4l2_format v4l2Format;\n> +\tstruct v4l2_pix_format *pix = &v4l2Format.fmt.pix;\n> \tint ret;\n> \n> -\tv4l2Fmt.type = bufferType_;\n> -\tpix->width = fmt->width;\n> -\tpix->height = fmt->height;\n> -\tpix->pixelformat = fmt->fourcc;\n> +\tv4l2Format.type = bufferType_;\n> +\tpix->width = format->width;\n> +\tpix->height = format->height;\n> +\tpix->pixelformat = format->fourcc;\n> \n> -\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Fmt);\n> +\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(Error) << \"Unable to set format: \" << strerror(-ret);\n> @@ -343,51 +343,51 @@ int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *fmt)\n> \treturn 0;\n> }\n> \n> -int V4L2Device::getFormatMultiplane(V4L2DeviceFormat *fmt)\n> +int V4L2Device::getFormatMultiplane(V4L2DeviceFormat *format)\n> {\n> -\tstruct v4l2_format v4l2Fmt;\n> -\tstruct v4l2_pix_format_mplane *pix = &v4l2Fmt.fmt.pix_mp;\n> +\tstruct v4l2_format v4l2Format;\n> +\tstruct v4l2_pix_format_mplane *pix = &v4l2Format.fmt.pix_mp;\n> \tint ret;\n> \n> -\tv4l2Fmt.type = bufferType_;\n> -\tret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Fmt);\n> +\tv4l2Format.type = bufferType_;\n> +\tret = ioctl(fd_, VIDIOC_G_FMT, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(Error) << \"Unable to get format: \" << strerror(-ret);\n> \t\treturn ret;\n> \t}\n> \n> -\tfmt->width = pix->width;\n> -\tfmt->height = pix->height;\n> -\tfmt->fourcc = pix->pixelformat;\n> -\tfmt->planes = pix->num_planes;\n> +\tformat->width = pix->width;\n> +\tformat->height = pix->height;\n> +\tformat->fourcc = pix->pixelformat;\n> +\tformat->planes = pix->num_planes;\n> \n> -\tfor (unsigned int i = 0; i < fmt->planes; ++i) {\n> -\t\tfmt->planesFmt[i].bpl = pix->plane_fmt[i].bytesperline;\n> -\t\tfmt->planesFmt[i].size = pix->plane_fmt[i].sizeimage;\n> +\tfor (unsigned int i = 0; i < format->planes; ++i) {\n> +\t\tformat->planesFmt[i].bpl = pix->plane_fmt[i].bytesperline;\n> +\t\tformat->planesFmt[i].size = pix->plane_fmt[i].sizeimage;\n> \t}\n> \n> \treturn 0;\n> }\n> \n> -int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *fmt)\n> +int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format)\n> {\n> -\tstruct v4l2_format v4l2Fmt;\n> -\tstruct v4l2_pix_format_mplane *pix = &v4l2Fmt.fmt.pix_mp;\n> +\tstruct v4l2_format v4l2Format;\n> +\tstruct v4l2_pix_format_mplane *pix = &v4l2Format.fmt.pix_mp;\n> \tint ret;\n> \n> -\tv4l2Fmt.type = bufferType_;\n> -\tpix->width = fmt->width;\n> -\tpix->height = fmt->height;\n> -\tpix->pixelformat = fmt->fourcc;\n> -\tpix->num_planes = fmt->planes;\n> +\tv4l2Format.type = bufferType_;\n> +\tpix->width = format->width;\n> +\tpix->height = format->height;\n> +\tpix->pixelformat = format->fourcc;\n> +\tpix->num_planes = format->planes;\n> \n> \tfor (unsigned int i = 0; i < pix->num_planes; ++i) {\n> -\t\tpix->plane_fmt[i].bytesperline = fmt->planesFmt[i].bpl;\n> -\t\tpix->plane_fmt[i].sizeimage = fmt->planesFmt[i].size;\n> +\t\tpix->plane_fmt[i].bytesperline = format->planesFmt[i].bpl;\n> +\t\tpix->plane_fmt[i].sizeimage = format->planesFmt[i].size;\n> \t}\n> \n> -\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Fmt);\n> +\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(Error) << \"Unable to set format: \" << strerror(-ret);","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 5F35F60B10\n\tfor ;\n\tFri, 1 Feb 2019 23:32:49 +0100 (CET)","from pendragon.ideasonboard.com (85-76-65-45-nat.elisa-mobile.fi\n\t[85.76.65.45])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BC7334F7;\n\tFri, 1 Feb 2019 23:32:47 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1549060368;\n\tbh=zIUOWW5/eYQPrwa8YZYWOaZJCk8XpzcP+lyY7vgXmeI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Irtcqac7+xCF+56K/2GKLv6haXILyxr4bGyM2egR2yZdocxKqkfzoM3IBtS7LyEc/\n\tUToZ1EEd3txo27RxqEKTc9As93+j9SQCVDuCHu6cFkUWJx4Pmj6mHkD0vTbW9RT9W4\n\tfxA9A2+vUvrkAI0Pkbrcua+N6VPHhNintZiT/COY=","Date":"Sat, 2 Feb 2019 00:32:43 +0200","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190201223243.GE4359@pendragon.ideasonboard.com>","References":"<20190201154248.15006-1-jacopo@jmondi.org>\n\t<20190201154248.15006-4-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190201154248.15006-4-jacopo@jmondi.org>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 3/7] libcamera: v4l2_device: Rename\n\tparameters to s/g_fmt","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 01 Feb 2019 22:32:49 -0000"}}]