{"id":374,"url":"https://patchwork.libcamera.org/api/1.1/patches/374/?format=json","web_url":"https://patchwork.libcamera.org/patch/374/","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":"<20190125143951.27992-2-niklas.soderlund@ragnatech.se>","date":"2019-01-25T14:39:49","name":"[libcamera-devel,v2,1/3] libcamera: pipelines: rename MediaDevice member for UVC and VIMC","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c95d49338e9c028c9cd417181e617772010cab70","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/374/mbox/","series":[{"id":130,"url":"https://patchwork.libcamera.org/api/1.1/series/130/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=130","date":"2019-01-25T14:39:49","name":"libcamera: pipeline: uvcvideo: attach to a V4L2Device","version":2,"mbox":"https://patchwork.libcamera.org/series/130/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/374/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/374/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8D1BC60B21\n\tfor ;\n\tFri, 25 Jan 2019 15:40:17 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 1e72a053-20af-11e9-9adf-005056917a89;\n\tFri, 25 Jan 2019 15:40:11 +0100 (CET)"],"X-Halon-ID":"1e72a053-20af-11e9-9adf-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Jan 2019 15:39:49 +0100","Message-Id":"<20190125143951.27992-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190125143951.27992-1-niklas.soderlund@ragnatech.se>","References":"<20190125143951.27992-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[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:40:17 -0000"},"content":"The name dev_ do a poor job of representing that it holds a media\ndevice, rename it to media_. There is no functional change in this\nchange just s/dev_/media_/.\n\nSuggested-by: Laurent Pinchart \nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/pipeline/uvcvideo.cpp | 18 +++++++++---------\n src/libcamera/pipeline/vimc.cpp | 14 +++++++-------\n 2 files changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 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 }\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 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));\n","prefixes":["libcamera-devel","v2","1/3"]}