{"id":13615,"url":"https://patchwork.libcamera.org/api/patches/13615/?format=json","web_url":"https://patchwork.libcamera.org/patch/13615/","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":"<20210903075249.1083572-1-umang.jain@ideasonboard.com>","date":"2021-09-03T07:52:49","name":"[libcamera-devel] android: Cleanup libcamera namespace usage","commit_ref":"8ae20f38bf89fb007c9fd7eeb1e10a1a9c00f40e","pull_url":null,"state":"accepted","archived":false,"hash":"a88a0fcd5951a6f3cda7eb4b81a220f7dfb6f6c9","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13615/mbox/","series":[{"id":2444,"url":"https://patchwork.libcamera.org/api/series/2444/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2444","date":"2021-09-03T07:52:49","name":"[libcamera-devel] android: Cleanup libcamera namespace usage","version":1,"mbox":"https://patchwork.libcamera.org/series/2444/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13615/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13615/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id C49A6BD87D\n\tfor ;\n\tFri, 3 Sep 2021 07:52:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A66F6916A;\n\tFri, 3 Sep 2021 09:52:58 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8E32760251\n\tfor ;\n\tFri, 3 Sep 2021 09:52:56 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.107])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DC0FBBE;\n\tFri, 3 Sep 2021 09:52:55 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"mTAzJzTM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630655576;\n\tbh=Um7TsKYeq2D5q5WDw1TBohF7vwDWgN3m2dFOLL9Tm1g=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=mTAzJzTMcTi3qApApTgPDskjgMQyAhWifHgZrLPeuxCMR2OuHt2O7sA9NtmtboLR7\n\tM8y2926tmSEZjdpt41mpUF/LLjVS5BEjnw6z4HvHqc90GpVnABLIrHZIVlSVVbBNnS\n\tCaLvN1icQ3df6uZHoqLFkvX6zvvPis4DNBquYwOQ=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 3 Sep 2021 13:22:49 +0530","Message-Id":"<20210903075249.1083572-1-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] android: Cleanup libcamera namespace usage","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Usually .cpp files are equipped with using namespace libcamera;\nHence, it is unnecessary mentioning the explicit namespace of\nlibcamera at certain places.\n\nWhile at it, a small typo in a comment was noticed and fixed as\npart of this patch.\n\nSigned-off-by: Umang Jain \n---\n src/android/camera_capabilities.cpp | 4 ++--\n src/android/camera_device.cpp | 6 +++---\n src/android/camera_stream.cpp | 4 ++--\n src/android/camera_worker.cpp | 2 +-\n src/android/mm/cros_camera_buffer.cpp | 6 +++---\n src/android/mm/generic_camera_buffer.cpp | 11 +++++------\n 6 files changed, 16 insertions(+), 17 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex c16e755f..e92bca42 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -378,7 +378,7 @@ void CameraCapabilities::computeHwLevel(\n \thwLevel_ = hwLevel;\n }\n \n-int CameraCapabilities::initialize(std::shared_ptr camera,\n+int CameraCapabilities::initialize(std::shared_ptr camera,\n \t\t\t\t int orientation, int facing)\n {\n \tcamera_ = camera;\n@@ -429,7 +429,7 @@ CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat,\n }\n \n std::vector\n-CameraCapabilities::initializeRawResolutions(const libcamera::PixelFormat &pixelFormat)\n+CameraCapabilities::initializeRawResolutions(const PixelFormat &pixelFormat)\n {\n \tstd::unique_ptr cameraConfig =\n \t\tcamera_->generateConfiguration({ StreamRole::Raw });\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8ca76719..d782067e 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -746,8 +746,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n }\n \n FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer,\n-\t\t\t\t\t libcamera::PixelFormat pixelFormat,\n-\t\t\t\t\t const libcamera::Size &size)\n+\t\t\t\t\t PixelFormat pixelFormat,\n+\t\t\t\t\t const Size &size)\n {\n \tFileDescriptor fd;\n \t/*\n@@ -1140,7 +1140,7 @@ void CameraDevice::requestComplete(Request *request)\n \tif (!resultMetadata) {\n \t\tnotifyError(descriptor.frameNumber_, nullptr, CAMERA3_MSG_ERROR_RESULT);\n \n-\t\t/* The camera framework expects an empy metadata pack on error. */\n+\t\t/* The camera framework expects an empty metadata pack on error. */\n \t\tresultMetadata = std::make_unique(0, 0);\n \t}\n \ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 01909ec7..0f5ae947 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -98,7 +98,7 @@ int CameraStream::configure()\n \treturn 0;\n }\n \n-int CameraStream::process(const libcamera::FrameBuffer &source,\n+int CameraStream::process(const FrameBuffer &source,\n \t\t\t buffer_handle_t camera3Dest,\n \t\t\t const CameraMetadata &requestMetadata,\n \t\t\t CameraMetadata *resultMetadata)\n@@ -139,7 +139,7 @@ FrameBuffer *CameraStream::getBuffer()\n \treturn buffer;\n }\n \n-void CameraStream::putBuffer(libcamera::FrameBuffer *buffer)\n+void CameraStream::putBuffer(FrameBuffer *buffer)\n {\n \tif (!allocator_)\n \t\treturn;\ndiff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp\nindex 98dddd9e..91313183 100644\n--- a/src/android/camera_worker.cpp\n+++ b/src/android/camera_worker.cpp\n@@ -27,7 +27,7 @@ LOG_DECLARE_CATEGORY(HAL)\n * by the CameraWorker which queues it to the libcamera::Camera after handling\n * fences.\n */\n-CaptureRequest::CaptureRequest(libcamera::Camera *camera)\n+CaptureRequest::CaptureRequest(Camera *camera)\n \t: camera_(camera)\n {\n \trequest_ = camera_->createRequest(reinterpret_cast(this));\ndiff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp\nindex 44993379..ec45e04c 100644\n--- a/src/android/mm/cros_camera_buffer.cpp\n+++ b/src/android/mm/cros_camera_buffer.cpp\n@@ -21,7 +21,7 @@ class CameraBuffer::Private : public Extensible::Private\n \n public:\n \tPrivate(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer,\n-\t\tlibcamera::PixelFormat pixelFormat, const libcamera::Size &size,\n+\t\tPixelFormat pixelFormat, const Size &size,\n \t\tint flags);\n \t~Private();\n \n@@ -53,8 +53,8 @@ private:\n \n CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,\n \t\t\t buffer_handle_t camera3Buffer,\n-\t\t\t [[maybe_unused]] libcamera::PixelFormat pixelFormat,\n-\t\t\t [[maybe_unused]] const libcamera::Size &size,\n+\t\t\t [[maybe_unused]] PixelFormat pixelFormat,\n+\t\t\t [[maybe_unused]] const Size &size,\n \t\t\t [[maybe_unused]] int flags)\n \t: handle_(camera3Buffer), numPlanes_(0), mapped_(false),\n \t registered_(false)\ndiff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\nindex 22efc4d4..27a30e2d 100644\n--- a/src/android/mm/generic_camera_buffer.cpp\n+++ b/src/android/mm/generic_camera_buffer.cpp\n@@ -20,14 +20,13 @@ using namespace libcamera;\n LOG_DECLARE_CATEGORY(HAL)\n \n class CameraBuffer::Private : public Extensible::Private,\n-\t\t\t public libcamera::MappedBuffer\n+\t\t\t public MappedBuffer\n {\n \tLIBCAMERA_DECLARE_PUBLIC(CameraBuffer)\n \n public:\n \tPrivate(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer,\n-\t\tlibcamera::PixelFormat pixelFormat, const libcamera::Size &size,\n-\t\tint flags);\n+\t\tPixelFormat pixelFormat, const Size &size, int flags);\n \t~Private();\n \n \tunsigned int numPlanes() const;\n@@ -58,13 +57,13 @@ private:\n \n CameraBuffer::Private::Private([[maybe_unused]] CameraBuffer *cameraBuffer,\n \t\t\t buffer_handle_t camera3Buffer,\n-\t\t\t libcamera::PixelFormat pixelFormat,\n-\t\t\t const libcamera::Size &size, int flags)\n+\t\t\t PixelFormat pixelFormat,\n+\t\t\t const Size &size, int flags)\n \t: fd_(-1), flags_(flags), bufferLength_(-1), mapped_(false)\n {\n \terror_ = 0;\n \n-\tconst auto &info = libcamera::PixelFormatInfo::info(pixelFormat);\n+\tconst auto &info = PixelFormatInfo::info(pixelFormat);\n \tif (!info.isValid()) {\n \t\terror_ = -EINVAL;\n \t\tLOG(HAL, Error) << \"Invalid pixel format: \"\n","prefixes":["libcamera-devel"]}