[{"id":678,"web_url":"https://patchwork.libcamera.org/comment/678/","msgid":"<77b36227-bad3-5322-1ef1-4442ecaae9c7@ideasonboard.com>","date":"2019-01-29T10:05:42","subject":"Re: [libcamera-devel] [PATCH v4 4/6] libcamera: camera: extend\n\tcamera object to support streams","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Niklas,\n\nOn 29/01/2019 02:00, Niklas Söderlund wrote:\n> A camera consists of one or more video streams originating from the same\n> video source. The different streams could for example have access to\n> different hardware blocks in the video pipeline and therefore be able to\n> process the video source in different ways.\n> \n> All static information describing each stream need to be recorded at\n> camera creation. After a camera is created an application can retrieve\n> the static information about its stream at any time.\n> \n> Update all pipeline handlers to register one stream per camera, this\n> will be extended in the future for some of the pipelines.\n> \n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\nJust my usual Capitalisation comments of the Day here.\nThe discussion point about reconnecting cameras is only that ... a\ndiscussion point.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  include/libcamera/camera.h           |  8 ++++++-\n>  src/libcamera/camera.cpp             | 34 ++++++++++++++++++++++++----\n>  src/libcamera/pipeline/ipu3/ipu3.cpp |  9 ++++++--\n>  src/libcamera/pipeline/uvcvideo.cpp  |  5 +++-\n>  src/libcamera/pipeline/vimc.cpp      |  5 +++-\n>  5 files changed, 52 insertions(+), 9 deletions(-)\n> \n> diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\n> index 7e358f8c0aa093cf..3ebb8e96cc63b98a 100644\n> --- a/include/libcamera/camera.h\n> +++ b/include/libcamera/camera.h\n> @@ -15,12 +15,14 @@\n>  namespace libcamera {\n>  \n>  class PipelineHandler;\n> +class Stream;\n>  \n>  class Camera final\n>  {\n>  public:\n>  \tstatic std::shared_ptr<Camera> create(PipelineHandler *pipe,\n> -\t\t\t\t\t      const std::string &name);\n> +\t\t\t\t\t      const std::string &name,\n> +\t\t\t\t\t      const std::vector<Stream *> &streams);\n>  \n>  \tCamera(const Camera &) = delete;\n>  \tvoid operator=(const Camera &) = delete;\n> @@ -32,6 +34,8 @@ public:\n>  \tint acquire();\n>  \tvoid release();\n>  \n> +\tstd::vector<Stream *> streams() const;\n> +\n>  private:\n>  \tCamera(PipelineHandler *pipe, const std::string &name);\n>  \t~Camera();\n> @@ -41,8 +45,10 @@ private:\n>  \n>  \tstd::shared_ptr<PipelineHandler> pipe_;\n>  \tstd::string name_;\n> +\tstd::vector<Stream *> streams_;\n>  \n>  \tbool acquired_;\n> +\tbool disconnected_;\n>  };\n>  \n>  } /* namespace libcamera */\n> diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> index 500976b237bcbd2d..c8604ec8a8e6eaf4 100644\n> --- a/src/libcamera/camera.cpp\n> +++ b/src/libcamera/camera.cpp\n> @@ -6,6 +6,7 @@\n>   */\n>  \n>  #include <libcamera/camera.h>\n> +#include <libcamera/stream.h>\n>  \n>  #include \"log.h\"\n>  #include \"pipeline_handler.h\"\n> @@ -56,13 +57,15 @@ LOG_DECLARE_CATEGORY(Camera)\n>   * \\brief Create a camera instance\n>   * \\param[in] name The name of the camera device\n>   * \\param[in] pipe The pipeline handler responsible for the camera device\n> + * \\param[in] streams Array of streams the camera provides\n\n\"Streams\" (except pluralisation is a pain in Doxygen)\n\nHere are some possible options to deal with this:\n\nA: Array of \\link Stream streams \\endlink provided by the Camera\nB: Array of streams (Stream) provided by the Camera\nC: Array of all Stream objects provided by the Camera\n\n\n\n>   *\n>   * The caller is responsible for guaranteeing unicity of the camera name.\n>   *\n>   * \\return A shared pointer to the newly created camera object\n>   */\n>  std::shared_ptr<Camera> Camera::create(PipelineHandler *pipe,\n> -\t\t\t\t       const std::string &name)\n> +\t\t\t\t       const std::string &name,\n> +\t\t\t\t       const std::vector<Stream *> &streams)\n>  {\n>  \tstruct Allocator : std::allocator<Camera> {\n>  \t\tvoid construct(void *p, PipelineHandler *pipe,\n> @@ -76,7 +79,12 @@ std::shared_ptr<Camera> Camera::create(PipelineHandler *pipe,\n>  \t\t}\n>  \t};\n>  \n> -\treturn std::allocate_shared<Camera>(Allocator(), pipe, name);\n> +\tstd::shared_ptr<Camera> camera =\n> +\t\tstd::allocate_shared<Camera>(Allocator(), pipe, name);\n> +\n> +\tcamera->streams_ = streams;\n> +\n> +\treturn camera;\n>  }\n>  \n>  /**\n> @@ -102,7 +110,8 @@ const std::string &Camera::name() const\n>   */\n>  \n>  Camera::Camera(PipelineHandler *pipe, const std::string &name)\n> -\t: pipe_(pipe->shared_from_this()), name_(name), acquired_(false)\n> +\t: pipe_(pipe->shared_from_this()), name_(name), acquired_(false),\n> +\t  disconnected_(false)\n>  {\n>  }\n>  \n> @@ -125,7 +134,7 @@ void Camera::disconnect()\n>  {\n>  \tLOG(Camera, Debug) << \"Disconnecting camera \" << name_;\n>  \n> -\t/** \\todo Block API calls when they will be implemented. */\n> +\tdisconnected_ = true;\n>  \tdisconnected.emit(this);\n\nWill we ever reconnect?\nOr will this object just be destroyed and a new one created?\n\nre-connecting an existing camera is tricky and requires keeping data\naround that perhaps we don't want (or maybe it would have a timeout?) -\nbut it would mean an app handling a camera could automatically resume\nplay in the event that a cable was pulled out and put back in again? (or\na dodgy electrical link or such ... )\n\n\n>  }\n>  \n> @@ -164,4 +173,21 @@ void Camera::release()\n>  \tacquired_ = false;\n>  }\n>  \n> +/**\n> + * \\brief Retrieve all the camera's stream information\n> + *\n> + * Retrieve all of the camera's static stream information. The static\n> + * information describes among other things how many streams the camera\n> + * support and each streams capabilities.\n> + *\n> + * \\return An array of all the camera's streams valid streams.\n> + */\n> +std::vector<Stream *> Camera::streams() const\n> +{\n> +\tif (disconnected_)\n> +\t\treturn std::vector<Stream *>{};\n> +\n> +\treturn streams_;\n> +}\n> +\n>  } /* namespace libcamera */\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index d74655d037728feb..f2029d17b4ad0273 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -9,6 +9,7 @@\n>  #include <vector>\n>  \n>  #include <libcamera/camera.h>\n> +#include <libcamera/stream.h>\n>  \n>  #include \"device_enumerator.h\"\n>  #include \"log.h\"\n> @@ -37,6 +38,7 @@ private:\n>  \t\t\t: dev_(nullptr) {}\n>  \t\t~IPU3CameraData() { delete dev_; }\n>  \t\tV4L2Device *dev_;\n> +\t\tStream stream_;\n>  \t};\n>  \n>  \tstd::shared_ptr<MediaDevice> cio2_;\n> @@ -196,8 +198,11 @@ void PipelineHandlerIPU3::registerCameras()\n>  \t\tif (link->setEnabled(true))\n>  \t\t\tcontinue;\n>  \n> +\t\tIPU3CameraData *data = new IPU3CameraData();\n> +\n>  \t\tstd::string cameraName = sensor->name() + \" \" + std::to_string(id);\n> -\t\tstd::shared_ptr<Camera> camera = Camera::create(this, cameraName);\n> +\t\tstd::vector<Stream *> streams{ &data->stream_ };\n> +\t\tstd::shared_ptr<Camera> camera = Camera::create(this, cameraName, streams);\n>  \n>  \t\t/*\n>  \t\t * If V4L2 device creation fails, the Camera instance won't be\n> @@ -209,10 +214,10 @@ void PipelineHandlerIPU3::registerCameras()\n>  \t\t\tLOG(IPU3, Error)\n>  \t\t\t\t<< \"Failed to register camera[\"\n>  \t\t\t\t<< numCameras << \"] \\\"\" << cameraName << \"\\\"\";\n> +\t\t\tdelete data;\n>  \t\t\tcontinue;\n>  \t\t}\n>  \n> -\t\tIPU3CameraData *data = new IPU3CameraData();\n>  \t\tdata->dev_ = videoDev;\n>  \t\tsetCameraData(camera.get(),\n>  \t\t\t      std::move(std::unique_ptr<IPU3CameraData>(data)));\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index c51e8bc1f2c2bf25..8ea7ac74d2a5395d 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -6,6 +6,7 @@\n>   */\n>  \n>  #include <libcamera/camera.h>\n> +#include <libcamera/stream.h>\n>  \n>  #include \"device_enumerator.h\"\n>  #include \"media_device.h\"\n> @@ -25,6 +26,7 @@ public:\n>  private:\n>  \tstd::shared_ptr<MediaDevice> media_;\n>  \tV4L2Device *video_;\n> +\tStream stream_;\n>  };\n>  \n>  PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n> @@ -64,7 +66,8 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n>  \t\treturn false;\n>  \t}\n>  \n> -\tstd::shared_ptr<Camera> camera = Camera::create(this, media_->model());\n> +\tstd::vector<Stream *> streams{ &stream_ };\n> +\tstd::shared_ptr<Camera> camera = Camera::create(this, media_->model(), streams);\n>  \tregisterCamera(std::move(camera));\n>  \thotplugMediaDevice(media_.get());\n>  \n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index f58a97d51619515d..9e1cf11a20c7a7e3 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -6,6 +6,7 @@\n>   */\n>  \n>  #include <libcamera/camera.h>\n> +#include <libcamera/stream.h>\n>  \n>  #include \"device_enumerator.h\"\n>  #include \"media_device.h\"\n> @@ -23,6 +24,7 @@ public:\n>  \n>  private:\n>  \tstd::shared_ptr<MediaDevice> media_;\n> +\tStream stream_;\n>  };\n>  \n>  PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager)\n> @@ -56,7 +58,8 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)\n>  \n>  \tmedia_->acquire();\n>  \n> -\tstd::shared_ptr<Camera> camera = Camera::create(this, \"Dummy VIMC Camera\");\n> +\tstd::vector<Stream *> streams{ &stream_ };\n> +\tstd::shared_ptr<Camera> camera = Camera::create(this, \"Dummy VIMC Camera\", streams);\n>  \tregisterCamera(std::move(camera));\n>  \n>  \treturn true;\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E9CF660B2D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Jan 2019 11:05:45 +0100 (CET)","from [192.168.0.21]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4B5E685;\n\tTue, 29 Jan 2019 11:05:45 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548756345;\n\tbh=Gy6iEwqzFr+yE1KCAYWBXvxWaVRB+7TKh9/iG0YApGA=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=leYF0gcVZMbMeDzYEijeMRC+5c2g3O4TC8shvxm6Hp/WzZm4sxb6JhXfT3o8CsiUB\n\tiVsY/Tngx1Xnlp5Gz1Yj+WUKz+MwR+e2UmUWYCKKGDdBnLX58bjsdpAL3jFlDOiItG\n\tSwLWPBnj8Hh9/VBMze/gwSwBdUItmP0oL/hBvzN0=","Reply-To":"kieran.bingham@ideasonboard.com","To":"=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20190129020048.16774-1-niklas.soderlund@ragnatech.se>\n\t<20190129020048.16774-5-niklas.soderlund@ragnatech.se>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\tmQINBFYE/WYBEACs1PwjMD9rgCu1hlIiUA1AXR4rv2v+BCLUq//vrX5S5bjzxKAryRf0uHat\n\tV/zwz6hiDrZuHUACDB7X8OaQcwhLaVlq6byfoBr25+hbZG7G3+5EUl9cQ7dQEdvNj6V6y/SC\n\trRanWfelwQThCHckbobWiQJfK9n7rYNcPMq9B8e9F020LFH7Kj6YmO95ewJGgLm+idg1Kb3C\n\tpotzWkXc1xmPzcQ1fvQMOfMwdS+4SNw4rY9f07Xb2K99rjMwZVDgESKIzhsDB5GY465sCsiQ\n\tcSAZRxqE49RTBq2+EQsbrQpIc8XiffAB8qexh5/QPzCmR4kJgCGeHIXBtgRj+nIkCJPZvZtf\n\tKr2EAbc6tgg6DkAEHJb+1okosV09+0+TXywYvtEop/WUOWQ+zo+Y/OBd+8Ptgt1pDRyOBzL8\n\tRXa8ZqRf0Mwg75D+dKntZeJHzPRJyrlfQokngAAs4PaFt6UfS+ypMAF37T6CeDArQC41V3ko\n\tlPn1yMsVD0p+6i3DPvA/GPIksDC4owjnzVX9kM8Zc5Cx+XoAN0w5Eqo4t6qEVbuettxx55gq\n\t8K8FieAjgjMSxngo/HST8TpFeqI5nVeq0/lqtBRQKumuIqDg+Bkr4L1V/PSB6XgQcOdhtd36\n\tOe9X9dXB8YSNt7VjOcO7BTmFn/Z8r92mSAfHXpb07YJWJosQOQARAQABtDBLaWVyYW4gQmlu\n\tZ2hhbSA8a2llcmFuLmJpbmdoYW1AaWRlYXNvbmJvYXJkLmNvbT6JAkAEEwEKACoCGwMFCwkI\n\tBwIGFQgJCgsCBBYCAwECHgECF4ACGQEFAlnDk/gFCQeA/YsACgkQoR5GchCkYf3X5w/9EaZ7\n\tcnUcT6dxjxrcmmMnfFPoQA1iQXr/MXQJBjFWfxRUWYzjvUJb2D/FpA8FY7y+vksoJP7pWDL7\n\tQTbksdwzagUEk7CU45iLWL/CZ/knYhj1I/+5LSLFmvZ/5Gf5xn2ZCsmg7C0MdW/GbJ8IjWA8\n\t/LKJSEYH8tefoiG6+9xSNp1p0Gesu3vhje/GdGX4wDsfAxx1rIYDYVoX4bDM+uBUQh7sQox/\n\tR1bS0AaVJzPNcjeC14MS226mQRUaUPc9250aj44WmDfcg44/kMsoLFEmQo2II9aOlxUDJ+x1\n\txohGbh9mgBoVawMO3RMBihcEjo/8ytW6v7xSF+xP4Oc+HOn7qebAkxhSWcRxQVaQYw3S9iZz\n\t2iA09AXAkbvPKuMSXi4uau5daXStfBnmOfalG0j+9Y6hOFjz5j0XzaoF6Pln0jisDtWltYhP\n\tX9LjFVhhLkTzPZB/xOeWGmsG4gv2V2ExbU3uAmb7t1VSD9+IO3Km4FtnYOKBWlxwEd8qOFpS\n\tjEqMXURKOiJvnw3OXe9MqG19XdeENA1KyhK5rqjpwdvPGfSn2V+SlsdJA0DFsobUScD9qXQw\n\tOvhapHe3XboK2+Rd7L+g/9Ud7ZKLQHAsMBXOVJbufA1AT+IaOt0ugMcFkAR5UbBg5+dZUYJj\n\t1QbPQcGmM3wfvuaWV5+SlJ+WeKIb8ta5Ag0EVgT9ZgEQAM4o5G/kmruIQJ3K9SYzmPishRHV\n\tDcUcvoakyXSX2mIoccmo9BHtD9MxIt+QmxOpYFNFM7YofX4lG0ld8H7FqoNVLd/+a0yru5Cx\n\tadeZBe3qr1eLns10Q90LuMo7/6zJhCW2w+HE7xgmCHejAwuNe3+7yt4QmwlSGUqdxl8cgtS1\n\tPlEK93xXDsgsJj/bw1EfSVdAUqhx8UQ3aVFxNug5OpoX9FdWJLKROUrfNeBE16RLrNrq2ROc\n\tiSFETpVjyC/oZtzRFnwD9Or7EFMi76/xrWzk+/b15RJ9WrpXGMrttHUUcYZEOoiC2lEXMSAF\n\tSSSj4vHbKDJ0vKQdEFtdgB1roqzxdIOg4rlHz5qwOTynueiBpaZI3PHDudZSMR5Fk6QjFooE\n\tXTw3sSl/km/lvUFiv9CYyHOLdygWohvDuMkV/Jpdkfq8XwFSjOle+vT/4VqERnYFDIGBxaRx\n\tkoBLfNDiiuR3lD8tnJ4A1F88K6ojOUs+jndKsOaQpDZV6iNFv8IaNIklTPvPkZsmNDhJMRHH\n\tIu60S7BpzNeQeT4yyY4dX9lC2JL/LOEpw8DGf5BNOP1KgjCvyp1/KcFxDAo89IeqljaRsCdP\n\t7WCIECWYem6pLwaw6IAL7oX+tEqIMPph/G/jwZcdS6Hkyt/esHPuHNwX4guqTbVEuRqbDzDI\n\t2DJO5FbxABEBAAGJAiUEGAEKAA8CGwwFAlnDlGsFCQeA/gIACgkQoR5GchCkYf1yYRAAq+Yo\n\tnbf9DGdK1kTAm2RTFg+w9oOp2Xjqfhds2PAhFFvrHQg1XfQR/UF/SjeUmaOmLSczM0s6XMeO\n\tVcE77UFtJ/+hLo4PRFKm5X1Pcar6g5m4xGqa+Xfzi9tRkwC29KMCoQOag1BhHChgqYaUH3yo\n\tUzaPwT/fY75iVI+yD0ih/e6j8qYvP8pvGwMQfrmN9YB0zB39YzCSdaUaNrWGD3iCBxg6lwSO\n\tLKeRhxxfiXCIYEf3vwOsP3YMx2JkD5doseXmWBGW1U0T/oJF+DVfKB6mv5UfsTzpVhJRgee7\n\t4jkjqFq4qsUGxcvF2xtRkfHFpZDbRgRlVmiWkqDkT4qMA+4q1y/dWwshSKi/uwVZNycuLsz+\n\t+OD8xPNCsMTqeUkAKfbD8xW4LCay3r/dD2ckoxRxtMD9eOAyu5wYzo/ydIPTh1QEj9SYyvp8\n\tO0g6CpxEwyHUQtF5oh15O018z3ZLztFJKR3RD42VKVsrnNDKnoY0f4U0z7eJv2NeF8xHMuiU\n\tRCIzqxX1GVYaNkKTnb/Qja8hnYnkUzY1Lc+OtwiGmXTwYsPZjjAaDX35J/RSKAoy5wGo/YFA\n\tJxB1gWThL4kOTbsqqXj9GLcyOImkW0lJGGR3o/fV91Zh63S5TKnf2YGGGzxki+ADdxVQAm+Q\n\tsbsRB8KNNvVXBOVNwko86rQqF9drZuw=","Organization":"Ideas on Board","Message-ID":"<77b36227-bad3-5322-1ef1-4442ecaae9c7@ideasonboard.com>","Date":"Tue, 29 Jan 2019 10:05:42 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.2.1","MIME-Version":"1.0","In-Reply-To":"<20190129020048.16774-5-niklas.soderlund@ragnatech.se>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v4 4/6] libcamera: camera: extend\n\tcamera object to support streams","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","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>","X-List-Received-Date":"Tue, 29 Jan 2019 10:05:46 -0000"}},{"id":683,"web_url":"https://patchwork.libcamera.org/comment/683/","msgid":"<20190129132024.GD19527@bigcity.dyn.berto.se>","date":"2019-01-29T13:20:24","subject":"Re: [libcamera-devel] [PATCH v4 4/6] libcamera: camera: extend\n\tcamera object to support streams","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Kieran,\n\nThanks for your feedback.\n\nOn 2019-01-29 10:05:42 +0000, Kieran Bingham wrote:\n> Hi Niklas,\n> \n> On 29/01/2019 02:00, Niklas Söderlund wrote:\n> > A camera consists of one or more video streams originating from the same\n> > video source. The different streams could for example have access to\n> > different hardware blocks in the video pipeline and therefore be able to\n> > process the video source in different ways.\n> > \n> > All static information describing each stream need to be recorded at\n> > camera creation. After a camera is created an application can retrieve\n> > the static information about its stream at any time.\n> > \n> > Update all pipeline handlers to register one stream per camera, this\n> > will be extended in the future for some of the pipelines.\n> > \n> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> \n> Just my usual Capitalisation comments of the Day here.\n> The discussion point about reconnecting cameras is only that ... a\n> discussion point.\n\nI left it as is until we decide what to do.\n\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> > ---\n> >  include/libcamera/camera.h           |  8 ++++++-\n> >  src/libcamera/camera.cpp             | 34 ++++++++++++++++++++++++----\n> >  src/libcamera/pipeline/ipu3/ipu3.cpp |  9 ++++++--\n> >  src/libcamera/pipeline/uvcvideo.cpp  |  5 +++-\n> >  src/libcamera/pipeline/vimc.cpp      |  5 +++-\n> >  5 files changed, 52 insertions(+), 9 deletions(-)\n> > \n> > diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h\n> > index 7e358f8c0aa093cf..3ebb8e96cc63b98a 100644\n> > --- a/include/libcamera/camera.h\n> > +++ b/include/libcamera/camera.h\n> > @@ -15,12 +15,14 @@\n> >  namespace libcamera {\n> >  \n> >  class PipelineHandler;\n> > +class Stream;\n> >  \n> >  class Camera final\n> >  {\n> >  public:\n> >  \tstatic std::shared_ptr<Camera> create(PipelineHandler *pipe,\n> > -\t\t\t\t\t      const std::string &name);\n> > +\t\t\t\t\t      const std::string &name,\n> > +\t\t\t\t\t      const std::vector<Stream *> &streams);\n> >  \n> >  \tCamera(const Camera &) = delete;\n> >  \tvoid operator=(const Camera &) = delete;\n> > @@ -32,6 +34,8 @@ public:\n> >  \tint acquire();\n> >  \tvoid release();\n> >  \n> > +\tstd::vector<Stream *> streams() const;\n> > +\n> >  private:\n> >  \tCamera(PipelineHandler *pipe, const std::string &name);\n> >  \t~Camera();\n> > @@ -41,8 +45,10 @@ private:\n> >  \n> >  \tstd::shared_ptr<PipelineHandler> pipe_;\n> >  \tstd::string name_;\n> > +\tstd::vector<Stream *> streams_;\n> >  \n> >  \tbool acquired_;\n> > +\tbool disconnected_;\n> >  };\n> >  \n> >  } /* namespace libcamera */\n> > diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\n> > index 500976b237bcbd2d..c8604ec8a8e6eaf4 100644\n> > --- a/src/libcamera/camera.cpp\n> > +++ b/src/libcamera/camera.cpp\n> > @@ -6,6 +6,7 @@\n> >   */\n> >  \n> >  #include <libcamera/camera.h>\n> > +#include <libcamera/stream.h>\n> >  \n> >  #include \"log.h\"\n> >  #include \"pipeline_handler.h\"\n> > @@ -56,13 +57,15 @@ LOG_DECLARE_CATEGORY(Camera)\n> >   * \\brief Create a camera instance\n> >   * \\param[in] name The name of the camera device\n> >   * \\param[in] pipe The pipeline handler responsible for the camera device\n> > + * \\param[in] streams Array of streams the camera provides\n> \n> \"Streams\" (except pluralisation is a pain in Doxygen)\n> \n> Here are some possible options to deal with this:\n> \n> A: Array of \\link Stream streams \\endlink provided by the Camera\n> B: Array of streams (Stream) provided by the Camera\n> C: Array of all Stream objects provided by the Camera\n\nI think this adds value to our discussion, thanks for sharing your \nfindings.\n\n> \n> \n> \n> >   *\n> >   * The caller is responsible for guaranteeing unicity of the camera name.\n> >   *\n> >   * \\return A shared pointer to the newly created camera object\n> >   */\n> >  std::shared_ptr<Camera> Camera::create(PipelineHandler *pipe,\n> > -\t\t\t\t       const std::string &name)\n> > +\t\t\t\t       const std::string &name,\n> > +\t\t\t\t       const std::vector<Stream *> &streams)\n> >  {\n> >  \tstruct Allocator : std::allocator<Camera> {\n> >  \t\tvoid construct(void *p, PipelineHandler *pipe,\n> > @@ -76,7 +79,12 @@ std::shared_ptr<Camera> Camera::create(PipelineHandler *pipe,\n> >  \t\t}\n> >  \t};\n> >  \n> > -\treturn std::allocate_shared<Camera>(Allocator(), pipe, name);\n> > +\tstd::shared_ptr<Camera> camera =\n> > +\t\tstd::allocate_shared<Camera>(Allocator(), pipe, name);\n> > +\n> > +\tcamera->streams_ = streams;\n> > +\n> > +\treturn camera;\n> >  }\n> >  \n> >  /**\n> > @@ -102,7 +110,8 @@ const std::string &Camera::name() const\n> >   */\n> >  \n> >  Camera::Camera(PipelineHandler *pipe, const std::string &name)\n> > -\t: pipe_(pipe->shared_from_this()), name_(name), acquired_(false)\n> > +\t: pipe_(pipe->shared_from_this()), name_(name), acquired_(false),\n> > +\t  disconnected_(false)\n> >  {\n> >  }\n> >  \n> > @@ -125,7 +134,7 @@ void Camera::disconnect()\n> >  {\n> >  \tLOG(Camera, Debug) << \"Disconnecting camera \" << name_;\n> >  \n> > -\t/** \\todo Block API calls when they will be implemented. */\n> > +\tdisconnected_ = true;\n> >  \tdisconnected.emit(this);\n> \n> Will we ever reconnect?\n> Or will this object just be destroyed and a new one created?\n> \n> re-connecting an existing camera is tricky and requires keeping data\n> around that perhaps we don't want (or maybe it would have a timeout?) -\n> but it would mean an app handling a camera could automatically resume\n> play in the event that a cable was pulled out and put back in again? (or\n> a dodgy electrical link or such ... )\n\nNo, a camera will never be reconnected. If the media device returns a \nnew PipelineHandler will be created and new cameras created. The reason \nwe need this is so that an application can still access a Camera object \nafter the hardware is gone without accessing invalid pointer and instead \nbe notified by the camera object that it's in fact no longer usable.\n\n> \n> \n> >  }\n> >  \n> > @@ -164,4 +173,21 @@ void Camera::release()\n> >  \tacquired_ = false;\n> >  }\n> >  \n> > +/**\n> > + * \\brief Retrieve all the camera's stream information\n> > + *\n> > + * Retrieve all of the camera's static stream information. The static\n> > + * information describes among other things how many streams the camera\n> > + * support and each streams capabilities.\n> > + *\n> > + * \\return An array of all the camera's streams valid streams.\n> > + */\n> > +std::vector<Stream *> Camera::streams() const\n> > +{\n> > +\tif (disconnected_)\n> > +\t\treturn std::vector<Stream *>{};\n> > +\n> > +\treturn streams_;\n> > +}\n> > +\n> >  } /* namespace libcamera */\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index d74655d037728feb..f2029d17b4ad0273 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -9,6 +9,7 @@\n> >  #include <vector>\n> >  \n> >  #include <libcamera/camera.h>\n> > +#include <libcamera/stream.h>\n> >  \n> >  #include \"device_enumerator.h\"\n> >  #include \"log.h\"\n> > @@ -37,6 +38,7 @@ private:\n> >  \t\t\t: dev_(nullptr) {}\n> >  \t\t~IPU3CameraData() { delete dev_; }\n> >  \t\tV4L2Device *dev_;\n> > +\t\tStream stream_;\n> >  \t};\n> >  \n> >  \tstd::shared_ptr<MediaDevice> cio2_;\n> > @@ -196,8 +198,11 @@ void PipelineHandlerIPU3::registerCameras()\n> >  \t\tif (link->setEnabled(true))\n> >  \t\t\tcontinue;\n> >  \n> > +\t\tIPU3CameraData *data = new IPU3CameraData();\n> > +\n> >  \t\tstd::string cameraName = sensor->name() + \" \" + std::to_string(id);\n> > -\t\tstd::shared_ptr<Camera> camera = Camera::create(this, cameraName);\n> > +\t\tstd::vector<Stream *> streams{ &data->stream_ };\n> > +\t\tstd::shared_ptr<Camera> camera = Camera::create(this, cameraName, streams);\n> >  \n> >  \t\t/*\n> >  \t\t * If V4L2 device creation fails, the Camera instance won't be\n> > @@ -209,10 +214,10 @@ void PipelineHandlerIPU3::registerCameras()\n> >  \t\t\tLOG(IPU3, Error)\n> >  \t\t\t\t<< \"Failed to register camera[\"\n> >  \t\t\t\t<< numCameras << \"] \\\"\" << cameraName << \"\\\"\";\n> > +\t\t\tdelete data;\n> >  \t\t\tcontinue;\n> >  \t\t}\n> >  \n> > -\t\tIPU3CameraData *data = new IPU3CameraData();\n> >  \t\tdata->dev_ = videoDev;\n> >  \t\tsetCameraData(camera.get(),\n> >  \t\t\t      std::move(std::unique_ptr<IPU3CameraData>(data)));\n> > diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> > index c51e8bc1f2c2bf25..8ea7ac74d2a5395d 100644\n> > --- a/src/libcamera/pipeline/uvcvideo.cpp\n> > +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> > @@ -6,6 +6,7 @@\n> >   */\n> >  \n> >  #include <libcamera/camera.h>\n> > +#include <libcamera/stream.h>\n> >  \n> >  #include \"device_enumerator.h\"\n> >  #include \"media_device.h\"\n> > @@ -25,6 +26,7 @@ public:\n> >  private:\n> >  \tstd::shared_ptr<MediaDevice> media_;\n> >  \tV4L2Device *video_;\n> > +\tStream stream_;\n> >  };\n> >  \n> >  PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n> > @@ -64,7 +66,8 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> >  \t\treturn false;\n> >  \t}\n> >  \n> > -\tstd::shared_ptr<Camera> camera = Camera::create(this, media_->model());\n> > +\tstd::vector<Stream *> streams{ &stream_ };\n> > +\tstd::shared_ptr<Camera> camera = Camera::create(this, media_->model(), streams);\n> >  \tregisterCamera(std::move(camera));\n> >  \thotplugMediaDevice(media_.get());\n> >  \n> > diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> > index f58a97d51619515d..9e1cf11a20c7a7e3 100644\n> > --- a/src/libcamera/pipeline/vimc.cpp\n> > +++ b/src/libcamera/pipeline/vimc.cpp\n> > @@ -6,6 +6,7 @@\n> >   */\n> >  \n> >  #include <libcamera/camera.h>\n> > +#include <libcamera/stream.h>\n> >  \n> >  #include \"device_enumerator.h\"\n> >  #include \"media_device.h\"\n> > @@ -23,6 +24,7 @@ public:\n> >  \n> >  private:\n> >  \tstd::shared_ptr<MediaDevice> media_;\n> > +\tStream stream_;\n> >  };\n> >  \n> >  PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager)\n> > @@ -56,7 +58,8 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)\n> >  \n> >  \tmedia_->acquire();\n> >  \n> > -\tstd::shared_ptr<Camera> camera = Camera::create(this, \"Dummy VIMC Camera\");\n> > +\tstd::vector<Stream *> streams{ &stream_ };\n> > +\tstd::shared_ptr<Camera> camera = Camera::create(this, \"Dummy VIMC Camera\", streams);\n> >  \tregisterCamera(std::move(camera));\n> >  \n> >  \treturn true;\n> > \n> \n> -- \n> Regards\n> --\n> Kieran","headers":{"Return-Path":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lj1-x229.google.com (mail-lj1-x229.google.com\n\t[IPv6:2a00:1450:4864:20::229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B695060DB6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Jan 2019 14:20:26 +0100 (CET)","by mail-lj1-x229.google.com with SMTP id l15-v6so17448370lja.9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Jan 2019 05:20:26 -0800 (PST)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tp10-v6sm3516920ljh.59.2019.01.29.05.20.24\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 29 Jan 2019 05:20:24 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=5Re8zg7T0Y/22dlF7uEm81Sk3MquKHH3HxzF1ptZEYo=;\n\tb=aoRc8/HdK/xkJlucZ25hA9Na+f8l72ctEoNreQrc6+O102b9m4M3DuOeqh/evokxhQ\n\twbtcTtPA6T76XEuGGJFSV0WM1Vxu4uhY/12OETGFDV9fe1tDWspfNNZhepGMd2n571RX\n\t1WVmCLPnjHM8EEC62sej13/MEDFT48WQh3FZkSpv+MlB0VP1WxGs64SpRBP/xXjD5Bs9\n\tZIPyKyJ/Xtneg61fQ9M52kIEXRHRl2JQzQEXv7nywDzTGLUgZN1/iR+xVWJ1Z45i5elk\n\topakabjxwUfODBRAdgWNf3a+KSVtYK+U6SLeYj2GMpGvEIGb1Zgt2ENZwPqTXdh668LL\n\t4McQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=5Re8zg7T0Y/22dlF7uEm81Sk3MquKHH3HxzF1ptZEYo=;\n\tb=Yij/vvDzUm2gPUK/iDczi+hYdTx8lv6U6VByLKZsH9HHhucBX1ch5GXtaUFE6YA4nJ\n\ticFpxLoFXPcFYO/Wmw/wOvmOzOf+NBHdhkLlfpbIeox5hLZJQ2dtoMBie6fJ8+XLKxNl\n\tJqX3Rv7Oqv6hlJFFplbOKNBjHQVQUJzf3oWXOGSX3pw71vgUdG5aj3/lmS42UUeN/Dnn\n\t6IZtysdLc0ON6/mrxGNKgpEOAA3e7PdEWmxvg2ZNWtzAiHgz5bA9hVkryHkTxF5qkmic\n\tpD7kCD5EEVmshsG51NPAHB0g02NansCcl6fJ/GBkBT1Lz4iMT0bonhdb5FI0vNGHcEh7\n\tDEsQ==","X-Gm-Message-State":"AJcUukf5aN0k7TDAGm8o0prrq71b3EELO3hBN8Cc08WG4o+ckqN0n6DD\n\t1DEKL3AJdmRLQOOO91Xr6TOukkxED9Q=","X-Google-Smtp-Source":"ALg8bN50idzRV/uIHyDZLW8jH8Bl4KHqV/ZNvQS3FTAM2lD85V5BxMRDuV3g7dzMI7/LShFPEuwHWg==","X-Received":"by 2002:a2e:890b:: with SMTP id\n\td11-v6mr22292268lji.113.1548768025852; \n\tTue, 29 Jan 2019 05:20:25 -0800 (PST)","Date":"Tue, 29 Jan 2019 14:20:24 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190129132024.GD19527@bigcity.dyn.berto.se>","References":"<20190129020048.16774-1-niklas.soderlund@ragnatech.se>\n\t<20190129020048.16774-5-niklas.soderlund@ragnatech.se>\n\t<77b36227-bad3-5322-1ef1-4442ecaae9c7@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<77b36227-bad3-5322-1ef1-4442ecaae9c7@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v4 4/6] libcamera: camera: extend\n\tcamera object to support streams","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","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>","X-List-Received-Date":"Tue, 29 Jan 2019 13:20:27 -0000"}}]