{"id":764,"url":"https://patchwork.libcamera.org/api/1.1/patches/764/?format=json","web_url":"https://patchwork.libcamera.org/patch/764/","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":"<20190320163055.22056-19-jacopo@jmondi.org>","date":"2019-03-20T16:30:42","name":"[libcamera-devel,v4,18/31] libcamera: ipu3: Create camera with 2 streams","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8a1e88425b96ce899fd6d8b331d5ab8ce10e3213","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/764/mbox/","series":[{"id":214,"url":"https://patchwork.libcamera.org/api/1.1/series/214/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=214","date":"2019-03-20T16:30:24","name":"libcamera: ipu3: Add ImgU support + multiple streams","version":4,"mbox":"https://patchwork.libcamera.org/series/214/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/764/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/764/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 28634612EC\n\tfor ;\n\tWed, 20 Mar 2019 17:30:39 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay12.mail.gandi.net (Postfix) with ESMTPSA id BB5D0200011;\n\tWed, 20 Mar 2019 16:30:38 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 20 Mar 2019 17:30:42 +0100","Message-Id":"<20190320163055.22056-19-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190320163055.22056-1-jacopo@jmondi.org>","References":"<20190320163055.22056-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 18/31] libcamera: ipu3: Create camera\n\twith 2 streams","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":"Wed, 20 Mar 2019 16:30:39 -0000"},"content":"Create each IPU3 camera with two streams: 'output' and 'viewfinder'\nwhich represents the video stream from main and secondary ImgU output\nrespectively.\n\nReturn a default configuration for both streams in\nstreamConfiguration().\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 42 ++++++++++++++++++----------\n 1 file changed, 28 insertions(+), 14 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 43fa0e4a7f9d..44e5eb48549e 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -120,6 +120,10 @@ private:\n \tstatic constexpr unsigned int IPU3_CIO2_BUFFER_COUNT = 4;\n \tstatic constexpr unsigned int IPU3_IMGU_BUFFER_COUNT = 4;\n \n+\tstatic constexpr unsigned int IPU3_STREAMS_COUNT = 2;\n+\tstatic constexpr unsigned int IPU3_STREAM_OUTPUT = 0;\n+\tstatic constexpr unsigned int IPU3_STREAM_VF = 1;\n+\n \tclass IPU3CameraData : public CameraData\n \t{\n \tpublic:\n@@ -135,7 +139,7 @@ private:\n \t\tCIO2Device cio2;\n \t\tImgUDevice *imgu;\n \n-\t\tStream stream_;\n+\t\tStream streams_[IPU3_STREAMS_COUNT];\n \t};\n \n \tIPU3CameraData *cameraData(const Camera *camera)\n@@ -194,7 +198,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n \tstd::map configs;\n \tIPU3CameraData *data = cameraData(camera);\n \tV4L2Subdevice *sensor = data->cio2.sensor;\n-\tStreamConfiguration *config = &configs[&data->stream_];\n+\tStreamConfiguration config = {};\n \tunsigned int bestSize = 0;\n \n \tconst FormatEnum formats = sensor->formats(0);\n@@ -213,8 +217,8 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n \n \t\t\tbestSize = frameSize;\n \n-\t\t\tconfig->width = range.maxWidth;\n-\t\t\tconfig->height = range.maxHeight;\n+\t\t\tconfig.width = range.maxWidth;\n+\t\t\tconfig.height = range.maxHeight;\n \t\t}\n \t}\n \n@@ -226,15 +230,22 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\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+\tconfig.width = 2560;\n+\tconfig.height = 1920;\n+\tconfig.pixelFormat = V4L2_PIX_FMT_NV12;\n+\tconfig.bufferCount = IPU3_BUFFER_COUNT;\n+\n+\tconfigs[&data->streams_[IPU3_STREAM_OUTPUT]] = config;\n+\tLOG(IPU3, Debug)\n+\t\t<< \"Stream 'Output' format set to \" << config.width << \"x\"\n+\t\t<< config.height << \"- 0x\" << std::hex << std::setfill('0')\n+\t\t<< std::setw(8) << config.pixelFormat;\n \n+\tconfigs[&data->streams_[IPU3_STREAM_VF]] = config;\n \tLOG(IPU3, Debug)\n-\t\t<< \"Stream format set to: \" << config->width << \"x\"\n-\t\t<< config->height << \"- 0x\" << std::hex << std::setfill('0')\n-\t\t<< std::setw(8) << config->pixelFormat;\n+\t\t<< \"Stream 'Viewfinder' format set to \" << config.width << \"x\"\n+\t\t<< config.height << \"- 0x\" << std::hex << std::setfill('0')\n+\t\t<< std::setw(8) << config.pixelFormat;\n \n \treturn configs;\n }\n@@ -243,7 +254,7 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n \t\t\t\t\t std::map &config)\n {\n \tIPU3CameraData *data = cameraData(camera);\n-\tconst StreamConfiguration &cfg = config[&data->stream_];\n+\tconst StreamConfiguration &cfg = config[&data->streams_[0]];\n \tV4L2Device *viewfinder = data->imgu->viewfinder;\n \tV4L2Device *output = data->imgu->output;\n \tV4L2Device *input = data->imgu->input;\n@@ -506,7 +517,7 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \tV4L2Device *viewfinder = data->imgu->viewfinder;\n \tV4L2Device *output = data->imgu->output;\n \tV4L2Device *stat = data->imgu->stat;\n-\tStream *stream = &data->stream_;\n+\tStream *stream = &data->streams_[0];\n \tBuffer *tmpBuffer;\n \n \t/*\n@@ -1097,7 +1108,10 @@ void PipelineHandlerIPU3::registerCameras()\n \tfor (unsigned int id = 0; id < 4 && numCameras < 2; ++id) {\n \t\tstd::unique_ptr data =\n \t\t\tutils::make_unique(this);\n-\t\tstd::set streams{ &data->stream_ };\n+\t\tstd::set streams = {\n+\t\t\t&data->streams_[IPU3_STREAM_OUTPUT],\n+\t\t\t&data->streams_[IPU3_STREAM_VF],\n+\t\t};\n \t\tCIO2Device *cio2 = &data->cio2;\n \t\tint ret;\n \n","prefixes":["libcamera-devel","v4","18/31"]}