From patchwork Mon Jan 6 16:14:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2517 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 12F1A60463 for ; Mon, 6 Jan 2020 17:14:32 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C72C123D; Mon, 6 Jan 2020 17:14:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1578327271; bh=PDjeAZLzgyFTovBIyKuatYwUN94hUX9iMc0UuB3KDjA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aEkDB/aXROOQnOsfTKfvby0k+Wejj64MZCR+ktp8OZxOSiXShMd3GUxMfJw7mMD6S 7qulWXx18ufjsltzIoVNRg+53tjUwtBbT+V8+T9tNpBuB70PqgNYQawrEF4F0jEE7i EP20aejEqeGeggRs7owzWemqMjF/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 Subject: [libcamera-devel] [PATCH 3/4] v4l2: camera_proxy: Rationalize arguments to format helpers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2020 16:14:32 -0000 To clarify code, adopt the following rules for format helpers: - All variables representing V4L2 pixel formats shall use uint32_t - All variables representing DRM pixel formats shall use PixelFormat - Functions returning positive values only shall not have a signed return type Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/v4l2/v4l2_camera_proxy.cpp | 18 +++++++++--------- src/v4l2/v4l2_camera_proxy.h | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index dd3ee3e6c6ff..6a222d702e13 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -510,7 +510,7 @@ int V4L2CameraProxy::ioctl(unsigned long request, void *arg) } /* \todo make libcamera export these */ -int V4L2CameraProxy::bplMultiplier(unsigned int format) +unsigned int V4L2CameraProxy::bplMultiplier(uint32_t format) { switch (format) { case V4L2_PIX_FMT_NV12: @@ -535,8 +535,8 @@ int V4L2CameraProxy::bplMultiplier(unsigned int format) }; } -int V4L2CameraProxy::imageSize(unsigned int format, - unsigned int width, unsigned int height) +unsigned int V4L2CameraProxy::imageSize(uint32_t format, unsigned int width, + unsigned int height) { switch (format) { case V4L2_PIX_FMT_NV12: @@ -563,9 +563,9 @@ int V4L2CameraProxy::imageSize(unsigned int format, }; } -unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat) +PixelFormat V4L2CameraProxy::v4l2ToDrm(uint32_t format) { - switch (pixelformat) { + switch (format) { /* RGB formats. */ case V4L2_PIX_FMT_RGB24: return DRM_FORMAT_BGR888; @@ -598,13 +598,13 @@ unsigned int V4L2CameraProxy::v4l2ToDrm(unsigned int pixelformat) case V4L2_PIX_FMT_NV42: return DRM_FORMAT_NV42; default: - return pixelformat; + return format; }; } -unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat) +uint32_t V4L2CameraProxy::drmToV4L2(PixelFormat format) { - switch (pixelformat) { + switch (format) { /* RGB formats. */ case DRM_FORMAT_BGR888: return V4L2_PIX_FMT_RGB24; @@ -637,6 +637,6 @@ unsigned int V4L2CameraProxy::drmToV4L2(unsigned int pixelformat) case DRM_FORMAT_NV42: return V4L2_PIX_FMT_NV42; default: - return pixelformat; + return format; } } diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index bef0f0afab3b..3d702084f8ff 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -54,12 +54,12 @@ private: int vidioc_streamon(int *arg); int vidioc_streamoff(int *arg); - static int bplMultiplier(unsigned int format); - static int imageSize(unsigned int format, unsigned int width, - unsigned int height); + static unsigned int bplMultiplier(uint32_t format); + static unsigned int imageSize(uint32_t format, unsigned int width, + unsigned int height); - static unsigned int v4l2ToDrm(unsigned int pixelformat); - static unsigned int drmToV4L2(unsigned int pixelformat); + static PixelFormat v4l2ToDrm(uint32_t format); + static uint32_t drmToV4L2(PixelFormat format); unsigned int refcount_; unsigned int index_;