[{"id":592,"web_url":"https://patchwork.libcamera.org/comment/592/","msgid":"<20190125144605.GB4320@pendragon.ideasonboard.com>","date":"2019-01-25T14:46:05","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: pipelines: rename\n\tMediaDevice member for UVC and VIMC","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Fri, Jan 25, 2019 at 03:39:49PM +0100, Niklas Söderlund wrote:\n> The name dev_ do a poor job of representing that it holds a media\n\ns/do/does/\n\n> device, rename it to media_. There is no functional change in this\n> change just s/dev_/media_/.\n> \n> Suggested-by: Laurent Pinchart \n> Signed-off-by: Niklas Söderlund \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++---------\n> src/libcamera/pipeline/vimc.cpp | 14 +++++++-------\n> 2 files changed, 16 insertions(+), 16 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index f84fa41515f1a439..5de8a0cb9c3406a8 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -22,34 +22,34 @@ public:\n> \tbool match(DeviceEnumerator *enumerator);\n> \n> private:\n> -\tstd::shared_ptr dev_;\n> +\tstd::shared_ptr media_;\n> };\n> \n> PipelineHandlerUVC::PipelineHandlerUVC(CameraManager *manager)\n> -\t: PipelineHandler(manager), dev_(nullptr)\n> +\t: PipelineHandler(manager), media_(nullptr)\n> {\n> }\n> \n> PipelineHandlerUVC::~PipelineHandlerUVC()\n> {\n> -\tif (dev_)\n> -\t\tdev_->release();\n> +\tif (media_)\n> +\t\tmedia_->release();\n> }\n> \n> bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> {\n> \tDeviceMatch dm(\"uvcvideo\");\n> \n> -\tdev_ = std::move(enumerator->search(dm));\n> +\tmedia_ = std::move(enumerator->search(dm));\n> \n> -\tif (!dev_)\n> +\tif (!media_)\n> \t\treturn false;\n> \n> -\tdev_->acquire();\n> +\tmedia_->acquire();\n> \n> -\tstd::shared_ptr camera = Camera::create(this, dev_->model());\n> +\tstd::shared_ptr camera = Camera::create(this, media_->model());\n> \tregisterCamera(std::move(camera));\n> -\thotplugMediaDevice(dev_.get());\n> +\thotplugMediaDevice(media_.get());\n> \n> \treturn true;\n> }\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index b714a07688e91a02..f58a97d51619515d 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -22,18 +22,18 @@ public:\n> \tbool match(DeviceEnumerator *enumerator);\n> \n> private:\n> -\tstd::shared_ptr dev_;\n> +\tstd::shared_ptr media_;\n> };\n> \n> PipeHandlerVimc::PipeHandlerVimc(CameraManager *manager)\n> -\t: PipelineHandler(manager), dev_(nullptr)\n> +\t: PipelineHandler(manager), media_(nullptr)\n> {\n> }\n> \n> PipeHandlerVimc::~PipeHandlerVimc()\n> {\n> -\tif (dev_)\n> -\t\tdev_->release();\n> +\tif (media_)\n> +\t\tmedia_->release();\n> }\n> \n> bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)\n> @@ -50,11 +50,11 @@ bool PipeHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tdm.add(\"RGB/YUV Input\");\n> \tdm.add(\"Scaler\");\n> \n> -\tdev_ = std::move(enumerator->search(dm));\n> -\tif (!dev_)\n> +\tmedia_ = std::move(enumerator->search(dm));\n> +\tif (!media_)\n> \t\treturn false;\n> \n> -\tdev_->acquire();\n> +\tmedia_->acquire();\n> \n> \tstd::shared_ptr camera = Camera::create(this, \"Dummy VIMC Camera\");\n> \tregisterCamera(std::move(camera));","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 88A2660B1D\n\tfor ;\n\tFri, 25 Jan 2019 15:46:07 +0100 (CET)","from pendragon.ideasonboard.com (unknown\n\t[IPv6:2a02:a03f:4499:2700:1060:1d4c:d6a:8e80])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2FE09325;\n\tFri, 25 Jan 2019 15:46:06 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548427566;\n\tbh=k37nj355Bzq+AXocSfD4MraGqdtca/AOyXRBI01EN1w=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=a5K/jVSh/cg+jOfYCXzwxR7Gnc8eUoFy8CJDfubGf10KtiOi5ilgialRgF+k8Bf0Y\n\tG9lVop4MKNgAwZRJspEZB2yGY/2eg0RtmsjtUkYNljyDUdV7SrRD2m1jriGBcw07Um\n\t29XLr9LIbKveZjq0luiH0sxAEjuRHXms8Zksglis=","Date":"Fri, 25 Jan 2019 16:46:05 +0200","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190125144605.GB4320@pendragon.ideasonboard.com>","References":"<20190125143951.27992-1-niklas.soderlund@ragnatech.se>\n\t<20190125143951.27992-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190125143951.27992-2-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: pipelines: rename\n\tMediaDevice member for UVC and VIMC","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, 25 Jan 2019 14:46:07 -0000"}}]