{"id":2517,"url":"https://patchwork.libcamera.org/api/patches/2517/?format=json","web_url":"https://patchwork.libcamera.org/patch/2517/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200106161417.19150-4-laurent.pinchart@ideasonboard.com>","date":"2020-01-06T16:14:16","name":"[libcamera-devel,3/4] v4l2: camera_proxy: Rationalize arguments to format helpers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5c9af9087b526ec122780470d0447b658d3c5dea","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2517/mbox/","series":[{"id":604,"url":"https://patchwork.libcamera.org/api/series/604/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=604","date":"2020-01-06T16:14:13","name":"v4l2: Miscellaneous improvements","version":1,"mbox":"https://patchwork.libcamera.org/series/604/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2517/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2517/checks/","tags":{},"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 12F1A60463\n\tfor ;\n\tMon, 6 Jan 2020 17:14:32 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C72C123D;\n\tMon, 6 Jan 2020 17:14:31 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578327271;\n\tbh=PDjeAZLzgyFTovBIyKuatYwUN94hUX9iMc0UuB3KDjA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=aEkDB/aXROOQnOsfTKfvby0k+Wejj64MZCR+ktp8OZxOSiXShMd3GUxMfJw7mMD6S\n\t7qulWXx18ufjsltzIoVNRg+53tjUwtBbT+V8+T9tNpBuB70PqgNYQawrEF4F0jEE7i\n\tEP20aejEqeGeggRs7owzWemqMjF/fDAPr2TRtAg4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 Jan 2020 18:14:16 +0200","Message-Id":"<20200106161417.19150-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>","References":"<20200106161417.19150-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/4] v4l2: camera_proxy: Rationalize\n\targuments to format helpers","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, 06 Jan 2020 16:14:32 -0000"},"content":"To clarify code, adopt the following rules for format helpers:\n\n- All variables representing V4L2 pixel formats shall use uint32_t\n- All variables representing DRM pixel formats shall use PixelFormat\n- Functions returning positive values only shall not have a signed\n return type\n\nSigned-off-by: Laurent Pinchart \n---\n src/v4l2/v4l2_camera_proxy.cpp | 18 +++++++++---------\n src/v4l2/v4l2_camera_proxy.h | 10 +++++-----\n 2 files changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex dd3ee3e6c6ff..6a222d702e13 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -510,7 +510,7 @@ int V4L2CameraProxy::ioctl(unsigned long request, void *arg)\n }\n \n /* \\todo make libcamera export these */\n-int V4L2CameraProxy::bplMultiplier(unsigned int format)\n+unsigned int V4L2CameraProxy::bplMultiplier(uint32_t format)\n {\n \tswitch (format) {\n \tcase V4L2_PIX_FMT_NV12:\n@@ -535,8 +535,8 @@ int V4L2CameraProxy::bplMultiplier(unsigned int format)\n \t};\n }\n \n-int V4L2CameraProxy::imageSize(unsigned int format,\n-\t\t\t unsigned int width, unsigned int height)\n+unsigned int V4L2CameraProxy::imageSize(uint32_t format, unsigned int width,\n+\t\t\t\t\tunsigned int height)\n {\n \tswitch (format) {\n \tcase V4L2_PIX_FMT_NV12:\n@@ -563,9 +563,9 @@ int V4L2CameraProxy::imageSize(unsigned int format,\n \t};\n }\n \n-unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat)\n+PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format)\n {\n-\tswitch (pixelformat) {\n+\tswitch (format) {\n \t/* RGB formats. */\n \tcase V4L2_PIX_FMT_RGB24:\n \t\treturn DRM_FORMAT_BGR888;\n@@ -598,13 +598,13 @@ unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat)\n \tcase V4L2_PIX_FMT_NV42:\n \t\treturn DRM_FORMAT_NV42;\n \tdefault:\n-\t\treturn pixelformat;\n+\t\treturn format;\n \t};\n }\n \n-unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat)\n+uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format)\n {\n-\tswitch (pixelformat) {\n+\tswitch (format) {\n \t/* RGB formats. */\n \tcase DRM_FORMAT_BGR888:\n \t\treturn V4L2_PIX_FMT_RGB24;\n@@ -637,6 +637,6 @@ unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat)\n \tcase DRM_FORMAT_NV42:\n \t\treturn V4L2_PIX_FMT_NV42;\n \tdefault:\n-\t\treturn pixelformat;\n+\t\treturn format;\n \t}\n }\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex bef0f0afab3b..3d702084f8ff 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -54,12 +54,12 @@ private:\n \tint vidioc_streamon(int *arg);\n \tint vidioc_streamoff(int *arg);\n \n-\tstatic int bplMultiplier(unsigned int format);\n-\tstatic int imageSize(unsigned int format, unsigned int width,\n-\t\t\t unsigned int height);\n+\tstatic unsigned int bplMultiplier(uint32_t format);\n+\tstatic unsigned int imageSize(uint32_t format, unsigned int width,\n+\t\t\t\t unsigned int height);\n \n-\tstatic unsigned int v4l2ToDrm(unsigned int pixelformat);\n-\tstatic unsigned int drmToV4L2(unsigned int pixelformat);\n+\tstatic PixelFormat v4l2ToDrm(uint32_t format);\n+\tstatic uint32_t drmToV4L2(PixelFormat format);\n \n \tunsigned int refcount_;\n \tunsigned int index_;\n","prefixes":["libcamera-devel","3/4"]}