{"id":8923,"url":"https://patchwork.libcamera.org/api/1.1/patches/8923/?format=json","web_url":"https://patchwork.libcamera.org/patch/8923/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200722133009.26528-7-kgupta@es.iitr.ac.in>","date":"2020-07-22T13:30:08","name":"[libcamera-devel,6/7] libcamera: pipeline: vimc: Queue the buffers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aff9edc388d3679dbd6ab3d2d466c6019ce5ec6a","submitter":{"id":39,"url":"https://patchwork.libcamera.org/api/1.1/people/39/?format=json","name":"Kaaira Gupta","email":"kgupta@es.iitr.ac.in"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/1.1/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/8923/mbox/","series":[{"id":1127,"url":"https://patchwork.libcamera.org/api/1.1/series/1127/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1127","date":"2020-07-22T13:30:02","name":"vimc: Introduce multiple streaming","version":1,"mbox":"https://patchwork.libcamera.org/series/1127/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8923/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8923/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 D367DBDB1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 22 Jul 2020 13:30:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9FE3660994;\n\tWed, 22 Jul 2020 15:30:41 +0200 (CEST)","from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com\n\t[IPv6:2607:f8b0:4864:20::62d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 311AF6053C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jul 2020 15:30:40 +0200 (CEST)","by mail-pl1-x62d.google.com with SMTP id o1so1007973plk.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jul 2020 06:30:40 -0700 (PDT)","from kaaira-HP-Pavilion-Notebook ([103.113.213.178])\n\tby smtp.gmail.com with ESMTPSA id\n\tz6sm23517788pfn.173.2020.07.22.06.30.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 22 Jul 2020 06:30:38 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=es-iitr-ac-in.20150623.gappssmtp.com\n\theader.i=@es-iitr-ac-in.20150623.gappssmtp.com\n\theader.b=\"o/54liiM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=+3c51sUyT4iYVoTl5eFwaN3u9y2+PNbkP+wIjWb1BkA=;\n\tb=o/54liiMDYEKyESIJdayAzX5SutPw7oqPcSH+bhKQPog+2Xr+UnHkwmzYsGwDYNgr1\n\twv540dbKjMTt9JQZY/uneWvpPBRIHuY3hRqSvU2SjllKmI3wXruRVVbpslWRnTBrpq69\n\t+7xvM5hx3/CzuB1i2fZotpbgb93bk//yGuxOPjL+4LNCYNJU4KUisA+ODVpH6Tj+ZAvw\n\tBAV4C5opzleLUxoJiB5mZOtvA+VL7Vf80bU7XXNKTriCdVfj4sKq5kJtAFEYzKNZ605u\n\tCxumuzHcHAplorvCb/u9ipdjNb1gLPatY8YRC0jii+I/uB3jbgE2u2zhyI4r2vFbafkb\n\tOR9g==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=+3c51sUyT4iYVoTl5eFwaN3u9y2+PNbkP+wIjWb1BkA=;\n\tb=omQovNTvhHcev5FpstrAgeay8Q/k9AboCxIiYwdenMRHPCJU0ldMAtvK5UAgSFUMTe\n\tuC8E4enXADcffZWWKZqopxOHGVRNql5+58PZlH0zv2AIE3Lyx2bHpad2woeAlNCXJ3fi\n\th9ccbxura2pfwGSY0HvwQHuKgm4PV1D/VKWVX1ZVarV6YWxAdt4wdMYZccNdnbkuS7Lt\n\tkWeHp/mc0Z6+3MQiioTTPatpX61rr/UW46vSUqcYYYXgSm024ob98uqQNJzd0fBfWxNa\n\tEapVgOZ3TTf4U2Cdx0vlb7JE1Obuphv9tjE6UpPNTPGMhV3p9SQqxjIONTaOqJB3uM5f\n\tkj4g==","X-Gm-Message-State":"AOAM533qtagS3YAHEn5CmNKfzpmWZ2nr9tVjQ3nhXKhfXcBANeVthp4J\n\tYnIK/XDWNCOc7vd1vvGDkz9eVA==","X-Google-Smtp-Source":"ABdhPJx6J3n9lzAagjUdiF4W742vusRB4lnE7d/+rIkCQV/tXdTbGAipZrLvYPMF4/kTXsid5F3VCQ==","X-Received":"by 2002:a17:902:b714:: with SMTP id\n\td20mr24859373pls.318.1595424638816; \n\tWed, 22 Jul 2020 06:30:38 -0700 (PDT)","From":"Kaaira Gupta <kgupta@es.iitr.ac.in>","To":"libcamera-devel@lists.libcamera.org,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>","Date":"Wed, 22 Jul 2020 19:00:08 +0530","Message-Id":"<20200722133009.26528-7-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 6/7] libcamera: pipeline: vimc: Queue the\n\tbuffers","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"Kaaira Gupta <kgupta@es.iitr.ac.in>","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Queue the buffers correctly according to the streams requested.\n\nSigned-off-by: Kaaira Gupta <kgupta@es.iitr.ac.in>\n---\n src/libcamera/pipeline/vimc/vimc.cpp | 31 +++++++++++++++++++---------\n 1 file changed, 21 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 6010e1e..7e8d355 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -536,19 +536,30 @@ int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n int PipelineHandlerVimc::queueRequestDevice(Camera *camera, Request *request)\n {\n \tVimcCameraData *data = cameraData(camera);\n-\tFrameBuffer *buffer = request->findBuffer(&data->rgbStream_);\n-\tif (!buffer) {\n-\t\tLOG(VIMC, Error)\n-\t\t\t<< \"Attempt to queue request with invalid stream\";\n+\tfor (auto it : request->buffers()) {\n+\t\tStream *stream = static_cast<Stream *>(it.first);\n+\t\tFrameBuffer *buffer = it.second;\n+\t\tif (!buffer) {\n+\t\t\tLOG(VIMC, Error)\n+\t\t\t\t<< \"Attempt to queue request with invalid stream\";\n+\n+\t\t\treturn -ENOENT;\n+\t\t}\n \n-\t\treturn -ENOENT;\n-\t}\n+\t\tint ret;\n \n-\tint ret = processControls(data, request);\n-\tif (ret < 0)\n-\t\treturn ret;\n+\t\tif (stream == &data->rgbStream_)\n+\t\t\tret = data->video_->queueBuffer(buffer);\n+\t\tif (stream == &data->rawStream_)\n+\t\t\tret = data->raw_->queueBuffer(buffer);\n+\t\telse\n+\t\t\tcontinue;\n \n-\tret = data->video_->queueBuffer(buffer);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t\treturn ret;\n+\t}\n+\tint ret = processControls(data, request);\n \tif (ret < 0)\n \t\treturn ret;\n \n","prefixes":["libcamera-devel","6/7"]}