{"id":1077,"url":"https://patchwork.libcamera.org/api/patches/1077/?format=json","web_url":"https://patchwork.libcamera.org/patch/1077/","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":"<20190419101839.10337-5-jacopo@jmondi.org>","date":"2019-04-19T10:18:35","name":"[libcamera-devel,v7,4/8] libcamera: ipu3: Use roles in stream configuration","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6c660f89012f66f9f5ae909dcd3ba4c511126593","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1077/mbox/","series":[{"id":261,"url":"https://patchwork.libcamera.org/api/series/261/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=261","date":"2019-04-19T10:18:31","name":"libcamera: ipu3: Multiple streams support","version":7,"mbox":"https://patchwork.libcamera.org/series/261/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1077/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1077/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0C6B460DCD\n\tfor ;\n\tFri, 19 Apr 2019 12:17:54 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 9BFCFFF806;\n\tFri, 19 Apr 2019 10:17:53 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 19 Apr 2019 12:18:35 +0200","Message-Id":"<20190419101839.10337-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190419101839.10337-1-jacopo@jmondi.org>","References":"<20190419101839.10337-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v7 4/8] libcamera: ipu3: Use roles in\n\tstream configuration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 19 Apr 2019 10:17:55 -0000"},"content":"Use and inspect the stream roles provided by the application to\nstreamConfiguration() to assign streams to their intended roles and\nreturn a default configuration associated with them.\n\nSupport a limited number of usages, with the viewfinder stream able to\ncapture both continuous video streams and still images, and the main\noutput stream supporting still images images. This is an artificial\nlimitation until we figure out the exact capabilities of the hardware.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 113 ++++++++++++++++++++-------\n 1 file changed, 83 insertions(+), 30 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 9b2d96f22b2b..45edc24b5d4c 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -5,6 +5,7 @@\n * ipu3.cpp - Pipeline handler for Intel IPU3\n */\n \n+#include \n #include \n #include \n #include \n@@ -222,38 +223,90 @@ CameraConfiguration\n PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n \t\t\t\t\t const std::vector &usages)\n {\n-\tCameraConfiguration configs;\n \tIPU3CameraData *data = cameraData(camera);\n-\tStreamConfiguration config = {};\n+\tCameraConfiguration cameraConfig;\n+\tstd::set streams = {\n+\t\t&data->outStream_,\n+\t\t&data->vfStream_,\n+\t};\n \n-\t/*\n-\t * FIXME: Soraka: the maximum resolution reported by both sensors\n-\t * (2592x1944 for ov5670 and 4224x3136 for ov13858) are returned as\n-\t * default configurations but they're not correctly processed by the\n-\t * ImgU. Resolutions up tp 2560x1920 have been validated.\n-\t *\n-\t * \\todo Clarify ImgU alignement requirements.\n-\t */\n-\tconfig.width = 2560;\n-\tconfig.height = 1920;\n-\tconfig.pixelFormat = V4L2_PIX_FMT_NV12;\n-\tconfig.bufferCount = IPU3_BUFFER_COUNT;\n-\n-\tconfigs[&data->outStream_] = config;\n-\tLOG(IPU3, Debug)\n-\t\t<< \"Stream '\" << data->outStream_.name_ << \"' set to \"\n-\t\t<< config.width << \"x\" << config.height << \"-0x\"\n-\t\t<< std::hex << std::setfill('0') << std::setw(8)\n-\t\t<< config.pixelFormat;\n-\n-\tconfigs[&data->vfStream_] = config;\n-\tLOG(IPU3, Debug)\n-\t\t<< \"Stream '\" << data->vfStream_.name_ << \"' set to \"\n-\t\t<< config.width << \"x\" << config.height << \"-0x\"\n-\t\t<< std::hex << std::setfill('0') << std::setw(8)\n-\t\t<< config.pixelFormat;\n-\n-\treturn configs;\n+\tfor (const StreamUsage &usage : usages) {\n+\t\tstd::vector::iterator found;\n+\t\tStreamUsage::Role role = usage.role();\n+\t\tStreamConfiguration streamConfig = {};\n+\t\tIPU3Stream *stream = nullptr;\n+\n+\t\tif (role == StreamUsage::Role::StillCapture) {\n+\t\t\t/*\n+\t\t\t * Don't allow viewfinder or video capture on the\n+\t\t\t * 'output stream. This is an artificial limitation\n+\t\t\t * until we figure out the capabilities of the\n+\t\t\t * hardware.\n+\t\t\t */\n+\t\t\tif (streams.find(&data->outStream_) != streams.end())\n+\t\t\t\tstream = &data->outStream_;\n+\t\t\telse if (streams.find(&data->vfStream_) != streams.end())\n+\t\t\t\tstream = &data->vfStream_;\n+\t\t\telse\n+\t\t\t\tgoto error;\n+\n+\t\t\t/*\n+\t\t\t * FIXME: Soraka: the maximum resolution reported by\n+\t\t\t * both sensors (2592x1944 for ov5670 and 4224x3136 for\n+\t\t\t * ov13858) are returned as default configurations but\n+\t\t\t * they're not correctly processed by the ImgU.\n+\t\t\t * Resolutions up tp 2560x1920 have been validated.\n+\t\t\t *\n+\t\t\t * \\todo Clarify ImgU alignment requirements.\n+\t\t\t */\n+\t\t\tstreamConfig.width = 2560;\n+\t\t\tstreamConfig.height = 1920;\n+\t\t} else if (role == StreamUsage::Role::Viewfinder ||\n+\t\t\t role == StreamUsage::Role::VideoRecording) {\n+\t\t\t/*\n+\t\t\t * We can't use the 'output' stream for viewfinder or\n+\t\t\t * video capture usages.\n+\t\t\t */\n+\t\t\tif (streams.find(&data->vfStream_) == streams.end())\n+\t\t\t\tgoto error;\n+\n+\t\t\tstream = &data->vfStream_;\n+\n+\n+\t\t\t/*\n+\t\t\t * Align the requested viewfinder size to the\n+\t\t\t * maximum available sensor resolution and to the\n+\t\t\t * IPU3 alignment constraints.\n+\t\t\t */\n+\t\t\tconst Size &res = data->cio2_.sensor_->resolution();\n+\t\t\tunsigned int width = std::min(usage.size().width,\n+\t\t\t\t\t\t res.width);\n+\t\t\tunsigned int height = std::min(usage.size().height,\n+\t\t\t\t\t\t res.height);\n+\t\t\tstreamConfig.width = width & ~7;\n+\t\t\tstreamConfig.height = height & ~3;\n+\t\t}\n+\n+\t\tstreams.erase(stream);\n+\n+\t\tstreamConfig.pixelFormat = V4L2_PIX_FMT_NV12;\n+\t\tstreamConfig.bufferCount = IPU3_BUFFER_COUNT;\n+\n+\t\tcameraConfig[stream] = streamConfig;\n+\n+\t\tLOG(IPU3, Debug)\n+\t\t\t<< \"Stream '\" << stream->name_ << \"' format set to \"\n+\t\t\t<< streamConfig.width << \"x\" << streamConfig.height\n+\t\t\t<< \"-0x\" << std::hex << std::setfill('0')\n+\t\t\t<< std::setw(8) << streamConfig.pixelFormat;\n+\t}\n+\n+\treturn cameraConfig;\n+\n+error:\n+\tLOG(IPU3, Error) << \"Requested stream roles not supported\";\n+\n+\treturn CameraConfiguration{};\n }\n \n int PipelineHandlerIPU3::configureStreams(Camera *camera,\n","prefixes":["libcamera-devel","v7","4/8"]}