From patchwork Wed Jul 22 13:30:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaaira Gupta X-Patchwork-Id: 8919 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 D9664BDB1B for ; Wed, 22 Jul 2020 13:30:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A48FB60991; Wed, 22 Jul 2020 15:30:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=es-iitr-ac-in.20150623.gappssmtp.com header.i=@es-iitr-ac-in.20150623.gappssmtp.com header.b="CGt+aRtL"; dkim-atps=neutral Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 16D6A6053C for ; Wed, 22 Jul 2020 15:30:25 +0200 (CEST) Received: by mail-pg1-x52a.google.com with SMTP id o13so1279391pgf.0 for ; Wed, 22 Jul 2020 06:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Inu6TdNqo/wikV1TauBqX/BnETqTDy3fmj9CxK6jz9I=; b=CGt+aRtLEA4gf0d8v1eYbOlb0BGtfChm0RHJC2zcvqsX9Rcz7FH8XBXpbqEvIo4XKh CojIuOK29u6Suil9JqBmwSnhp0+9Jw8XH6SPrRU5hzQWzhT27+VyfuwtK+u0dyvqcQ/R PCPrskERGOUF4pz15TqFqQ3d4xQjGsGZhwpuB2D+Shdy8zhGmICfB0hM+Pxfha8E2HTT JGnqJBsgxvxMHCAqbHdVt+fccPK2AMUTIvKIIdhF8nO+nsl4XP4c8zA7Tz/vMITPulzs YHs9v1j4G2vSjN/oY7ywGt6DVJ2rkI0lGTNUAVUeYMHMlUaeJJ7grJHnOsJkM27mqWS3 9zrw== 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; bh=Inu6TdNqo/wikV1TauBqX/BnETqTDy3fmj9CxK6jz9I=; b=RlObnRfhORL738W1IxBpqIwst5YR+DBOJZorGdGMAll6J/g0jZj+hTxZ/qL2WETNno 7Lk7lLoLyhycRuDBW6qmysw6/tXAhbrnhO4CHwgpplu/iqHwSzfQOFSrXuLK+2qEJSM4 okT4WePiR2w7x2xyh5BqBj96j6CJuxwlAsH/bkBc8mH632O0u87zwu4hZ+Lg8+vv6Y6M SJ0JGDT8htbDR7RkFn5x5MbFBamQJtaXOUxATVFkATzthK+WdfeRZ9jifZ3dHxgr4rZV kZgwgheXhLhlc9jO57zkbqLxZ9kcxafo25Y2PXhDpCPThQiByRpKYxQ98KFAATZ3HPp4 mCpQ== X-Gm-Message-State: AOAM533ck7lac0ICZqvmx9MHDtypq8aGZMqLfIJzOxejLbSXpFyygmBA 8pCUoHu6TPbBkgoimY0FBlga+g== X-Google-Smtp-Source: ABdhPJxzZ6w7ktUD9HniFxiVHFCq5eIcL4bUefP1DBl+pXXWUcBPGCltVCoOhFHO+LaHePZvok5AYw== X-Received: by 2002:a65:6795:: with SMTP id e21mr27756048pgr.289.1595424623708; Wed, 22 Jul 2020 06:30:23 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([103.113.213.178]) by smtp.gmail.com with ESMTPSA id p19sm20704699pgj.74.2020.07.22.06.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 06:30:23 -0700 (PDT) From: Kaaira Gupta To: libcamera-devel@lists.libcamera.org, Kieran Bingham Date: Wed, 22 Jul 2020 19:00:04 +0530 Message-Id: <20200722133009.26528-3-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200722133009.26528-1-kgupta@es.iitr.ac.in> References: <20200722133009.26528-1-kgupta@es.iitr.ac.in> Subject: [libcamera-devel] [PATCH 2/7] libcamera: pipeline: vimc: Introduce rawStream_ 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: , Cc: Kaaira Gupta MIME-Version: 1.0 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Change "stream_" to "rgbStream_" as it represents stream at RGB/YUV Capture, and introduce a raw stream for streaming with RAW capture 1 Signed-off-by: Kaaira Gupta --- src/libcamera/pipeline/vimc/vimc.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 4f461b9..bd6ddde 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -66,7 +66,8 @@ public: V4L2Subdevice *scaler_; V4L2VideoDevice *video_; V4L2VideoDevice *raw_; - Stream stream_; + Stream rgbStream_; + Stream rawStream_; }; class VimcCameraConfiguration : public CameraConfiguration @@ -290,7 +291,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config) if (ret) return ret; - cfg.setStream(&data->stream_); + cfg.setStream(&data->rgbStream_); return 0; } @@ -307,7 +308,7 @@ int PipelineHandlerVimc::exportFrameBuffers(Camera *camera, Stream *stream, int PipelineHandlerVimc::start(Camera *camera) { VimcCameraData *data = cameraData(camera); - unsigned int count = data->stream_.configuration().bufferCount; + unsigned int count = data->rgbStream_.configuration().bufferCount; int ret = data->video_->importBuffers(count); if (ret < 0) @@ -380,7 +381,7 @@ int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request) int PipelineHandlerVimc::queueRequestDevice(Camera *camera, Request *request) { VimcCameraData *data = cameraData(camera); - FrameBuffer *buffer = request->findBuffer(&data->stream_); + FrameBuffer *buffer = request->findBuffer(&data->rgbStream_); if (!buffer) { LOG(VIMC, Error) << "Attempt to queue request with invalid stream"; @@ -433,7 +434,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) /* Create and register the camera. */ std::string name{ "VIMC " + data->sensor_->model() }; - std::set streams{ &data->stream_ }; + std::set streams{ &data->rgbStream_, &data->rawStream_ }; std::shared_ptr camera = Camera::create(this, name, streams); registerCamera(std::move(camera), std::move(data));