From patchwork Tue Oct 20 09:15:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10130 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E233BBDB1F for ; Tue, 20 Oct 2020 09:15:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9F1FD613BB; Tue, 20 Oct 2020 11:15:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JSWZKxud"; dkim-atps=neutral Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A68E61373 for ; Tue, 20 Oct 2020 11:15:22 +0200 (CEST) Received: by mail-pl1-x62b.google.com with SMTP id h2so693506pll.11 for ; Tue, 20 Oct 2020 02:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=liyo/oDJijHOpl8icA2YflXE7zcQ+T55ARgEJEs61aw=; b=JSWZKxudeW1YSr+hmVwNnBe4He2z2M+Xg3MtRVBERg6zj85vjMEerjVwM+yWG0VYxS l0Z4iFXbC2MDr7zSpmX7yarUaOw8oozjrfKSZj7VgjW2UkCC6D0XCzfQdbdXSccqJzs6 Z1IZCX4ZcJmkCyQKuZekFXabVJzd8xZ508hQc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=liyo/oDJijHOpl8icA2YflXE7zcQ+T55ARgEJEs61aw=; b=PPsAEcka5wu/6tC9DYuTvp4VbBn+KuFwykCFrYfEN6JJwKhqKRwTHv7PciOt9cTJ4o aKr5URv84OeT/JcT6eDWeLzPFExt+8bVSCrYQ/h//l+8gUHwka9hydlaxm6nT0/1opn8 xFeiP5S1Q86baHdN58t2k4HUrBwVBfpZXFuLyOIcuHDNNPCZAXAku+mH8XlKHesNK760 l2AdFkrZ1XI4OYlw1qq/j8zuzY1vaMywku9AxZh+8isqfa4FiW+EXHbry986A64ps6pk ALP9X2HozNWHa7ib992fJ+2fCA1Ti49LuCNKEKqzv46x1U26KwB4VWRw8D7tH2sTOsyw VEiQ== X-Gm-Message-State: AOAM532AOoT2KzhsdbtlVvaohNsxpmr0v9IIv5aWLrmFI9WbfHuE7P8j GJNR11OQYuc3JcMlowaRhiVJWq29AjSWYw== X-Google-Smtp-Source: ABdhPJy2/iIGlAPoyALzFUE9+DOvOH1qAl+zampY39kSJrPxMOsMcwWGY4BX1C+h/XT+9obMlNoRUg== X-Received: by 2002:a17:90b:3114:: with SMTP id gc20mr1934092pjb.73.1603185320932; Tue, 20 Oct 2020 02:15:20 -0700 (PDT) Received: from hiroh.tok.corp.google.com ([2401:fa00:8f:2:de4a:3eff:fe7d:f78f]) by smtp.gmail.com with ESMTPSA id p8sm1482014pgs.34.2020.10.20.02.15.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Oct 2020 02:15:20 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 20 Oct 2020 18:15:03 +0900 Message-Id: <20201020091505.138898-6-hiroh@chromium.org> X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog In-Reply-To: <20201020091505.138898-1-hiroh@chromium.org> References: <20201020091505.138898-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 6/8] libcamera: Omit extra semicolons 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The end semicolons with LOG_DEFINE_CATEGORY, LOG_DECLARE_CATEGORY and REGISTER_PIPELINE_HANDLER are unnecessary. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- Documentation/guides/pipeline-handler.rst | 4 ++-- src/libcamera/byte_stream_buffer.cpp | 2 +- src/libcamera/camera_sensor.cpp | 2 +- src/libcamera/file.cpp | 2 +- src/libcamera/pipeline/ipu3/ipu3.cpp | 4 ++-- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 +- src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp | 2 +- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +- src/libcamera/pipeline/simple/converter.cpp | 2 +- src/libcamera/pipeline/simple/simple.cpp | 2 +- src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +- src/libcamera/pipeline/vimc/vimc.cpp | 2 +- src/libcamera/sysfs.cpp | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Documentation/guides/pipeline-handler.rst b/Documentation/guides/pipeline-handler.rst index 71ef205..d0370f1 100644 --- a/Documentation/guides/pipeline-handler.rst +++ b/Documentation/guides/pipeline-handler.rst @@ -258,7 +258,7 @@ methods for the overridden class members. return false; } - REGISTER_PIPELINE_HANDLER(PipelineHandlerVivid); + REGISTER_PIPELINE_HANDLER(PipelineHandlerVivid) } /* namespace libcamera */ @@ -1470,4 +1470,4 @@ application which will render the frames in a window for visual inspection: .. TODO: Running qcam with the vivid pipeline handler appears to have a bug and no visual frames are seen. However disabling zero-copy on qcam renders - them successfully. \ No newline at end of file + them successfully. diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp index df7029b..7db5501 100644 --- a/src/libcamera/byte_stream_buffer.cpp +++ b/src/libcamera/byte_stream_buffer.cpp @@ -14,7 +14,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(Serialization); +LOG_DEFINE_CATEGORY(Serialization) /** * \file byte_stream_buffer.h diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 78c7cee..935de52 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -28,7 +28,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(CameraSensor); +LOG_DEFINE_CATEGORY(CameraSensor) /** * \struct CameraSensorInfo diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index 04b0cb6..3a3f5bb 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -23,7 +23,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(File); +LOG_DEFINE_CATEGORY(File) /** * \class File diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index f5a20d3..af47739 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -66,7 +66,7 @@ public: Status validate() override; - const StreamConfiguration &cio2Format() const { return cio2Configuration_; }; + const StreamConfiguration &cio2Format() const { return cio2Configuration_; } const ImgUDevice::PipeConfig imguConfig() const { return pipeConfig_; } private: @@ -866,6 +866,6 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer) imgu_->input_->queueBuffer(buffer); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3); +REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 26dbd25..331ada7 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1675,6 +1675,6 @@ FrameBuffer *RPiCameraData::updateQueue(std::queue &q, uint64_t t return nullptr; } -REGISTER_PIPELINE_HANDLER(PipelineHandlerRPi); +REGISTER_PIPELINE_HANDLER(PipelineHandlerRPi) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp index 0572acc..62605c0 100644 --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp @@ -17,7 +17,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(RPI_S_W); +LOG_DEFINE_CATEGORY(RPI_S_W) namespace RPi { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index aec590f..2352ab3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -1184,6 +1184,6 @@ void PipelineHandlerRkISP1::statReady(FrameBuffer *buffer) data->ipa_->processEvent(op); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1); +REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 75fb297..b4ee021 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -21,7 +21,7 @@ namespace libcamera { -LOG_DECLARE_CATEGORY(SimplePipeline); +LOG_DECLARE_CATEGORY(SimplePipeline) SimpleConverter::SimpleConverter(MediaDevice *media) : m2m_(nullptr) diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 7adb17e..8c00c0f 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -942,6 +942,6 @@ void SimplePipelineHandler::converterDone(FrameBuffer *input, data->video_->queueBuffer(input); } -REGISTER_PIPELINE_HANDLER(SimplePipelineHandler); +REGISTER_PIPELINE_HANDLER(SimplePipelineHandler) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index 8ec0dac..a903a82 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -654,6 +654,6 @@ void UVCCameraData::bufferReady(FrameBuffer *buffer) pipe_->completeRequest(camera_, request); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC); +REGISTER_PIPELINE_HANDLER(PipelineHandlerUVC) } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index fc8085f..7416c37 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -533,6 +533,6 @@ void VimcCameraData::bufferReady(FrameBuffer *buffer) pipe_->completeRequest(camera_, request); } -REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc); +REGISTER_PIPELINE_HANDLER(PipelineHandlerVimc) } /* namespace libcamera */ diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp index 6c8e955..3ebe66f 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -22,7 +22,7 @@ namespace libcamera { -LOG_DEFINE_CATEGORY(SysFs); +LOG_DEFINE_CATEGORY(SysFs) namespace sysfs {