{"id":3880,"url":"https://patchwork.libcamera.org/api/1.1/patches/3880/?format=json","web_url":"https://patchwork.libcamera.org/patch/3880/","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":"<20200529110335.620503-4-jacopo@jmondi.org>","date":"2020-05-29T11:03:33","name":"[libcamera-devel,3/5] libcamera: Rename ImageFormats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"69313c36e778a028c0c9b5f15663cb06672e56ea","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/3880/mbox/","series":[{"id":938,"url":"https://patchwork.libcamera.org/api/1.1/series/938/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=938","date":"2020-05-29T11:03:30","name":"ImageFormats' not dead","version":1,"mbox":"https://patchwork.libcamera.org/series/938/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3880/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3880/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C2E72610DA\n\tfor ;\n\tFri, 29 May 2020 13:00:31 +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 relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 2A336E0005;\n\tFri, 29 May 2020 11:00:30 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 29 May 2020 13:03:33 +0200","Message-Id":"<20200529110335.620503-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200529110335.620503-1-jacopo@jmondi.org>","References":"<20200529110335.620503-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/5] libcamera: Rename ImageFormats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 29 May 2020 11:00:32 -0000"},"content":"The ImageFormats class is actually a map. Convey that in the class name.\n\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/internal/camera_sensor.h | 2 +-\n include/libcamera/internal/formats.h | 2 +-\n include/libcamera/internal/v4l2_subdevice.h | 2 +-\n include/libcamera/internal/v4l2_videodevice.h | 2 +-\n src/libcamera/formats.cpp | 32 +++++++++----------\n .../pipeline/raspberrypi/raspberrypi.cpp | 10 +++---\n src/libcamera/pipeline/simple/simple.cpp | 2 +-\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +-\n src/libcamera/v4l2_subdevice.cpp | 4 +--\n src/libcamera/v4l2_videodevice.cpp | 4 +--\n test/v4l2_subdevice/list_formats.cpp | 2 +-\n 11 files changed, 32 insertions(+), 32 deletions(-)","diff":"diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\nindex 5c1d5789fe79..52eedb9ef880 100644\n--- a/include/libcamera/internal/camera_sensor.h\n+++ b/include/libcamera/internal/camera_sensor.h\n@@ -75,7 +75,7 @@ private:\n \n \tstd::string model_;\n \n-\tImageFormats formats_;\n+\tImageFormatsMap formats_;\n \tSize resolution_;\n \tstd::vector mbusCodes_;\n \tstd::vector sizes_;\ndiff --git a/include/libcamera/internal/formats.h b/include/libcamera/internal/formats.h\nindex e20c031e857f..cc56e256f54c 100644\n--- a/include/libcamera/internal/formats.h\n+++ b/include/libcamera/internal/formats.h\n@@ -19,7 +19,7 @@\n namespace libcamera {\n \n template\n-class ImageFormats\n+class ImageFormatsMap\n {\n public:\n \tusing iterator = typename std::map>::iterator;\ndiff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\nindex 0ce6da48f58a..c9aa3428f93c 100644\n--- a/include/libcamera/internal/v4l2_subdevice.h\n+++ b/include/libcamera/internal/v4l2_subdevice.h\n@@ -51,7 +51,7 @@ public:\n \tint setSelection(unsigned int pad, unsigned int target,\n \t\t\t Rectangle *rect);\n \n-\tImageFormats formats(unsigned int pad);\n+\tImageFormatsMap formats(unsigned int pad);\n \n \tint getFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n \t\t Whence whence = ActiveFormat);\ndiff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h\nindex de4745982e94..02d101db0b2b 100644\n--- a/include/libcamera/internal/v4l2_videodevice.h\n+++ b/include/libcamera/internal/v4l2_videodevice.h\n@@ -187,7 +187,7 @@ public:\n \n \tint getFormat(V4L2DeviceFormat *format);\n \tint setFormat(V4L2DeviceFormat *format);\n-\tImageFormats formats(uint32_t code = 0);\n+\tImageFormatsMap formats(uint32_t code = 0);\n \n \tint setSelection(unsigned int target, Rectangle *rect);\n \ndiff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp\nindex a7922077d9c5..3acb6fe6284e 100644\n--- a/src/libcamera/formats.cpp\n+++ b/src/libcamera/formats.cpp\n@@ -21,7 +21,7 @@ namespace libcamera {\n LOG_DEFINE_CATEGORY(Formats)\n \n /**\n- * \\class ImageFormats\n+ * \\class ImageFormatsMap\n * \\brief Describe V4L2Device and V4L2SubDevice image formats and associated\n * image resolutions\n *\n@@ -36,62 +36,62 @@ LOG_DEFINE_CATEGORY(Formats)\n */\n \n /**\n- * \\typedef ImageFormats::iterator\n+ * \\typedef ImageFormatsMap::iterator\n * \\brief Iterator for the formats map\n */\n \n /**\n- * \\typedef ImageFormats::const_iterator\n+ * \\typedef ImageFormatsMap::const_iterator\n * \\brief Const iterator for the formats map\n */\n \n /**\n- * \\typedef ImageFormats::value_type\n+ * \\typedef ImageFormatsMap::value_type\n * \\brief Value type of the entries in the formats map\n */\n \n /**\n- * \\fn iterator ImageFormats::begin()\n+ * \\fn iterator ImageFormatsMap::begin()\n * \\brief Retrieve an iterator to the first element in the formats map\n * \\return An iterator to the first format map\n */\n \n /**\n- * \\fn const_iterator ImageFormats::begin() const\n+ * \\fn const_iterator ImageFormatsMap::begin() const\n * \\brief Retrieve an const iterator to the first element in the formats map\n * \\return A const iterator to the first format map\n */\n \n /**\n- * \\fn iterator ImageFormats::end()\n+ * \\fn iterator ImageFormatsMap::end()\n * \\brief Retrieve an iterator pointing to the past-the-end element in the\n * formats map\n * \\return An iterator to the element following the last format\n */\n \n /**\n- * \\fn const_iterator ImageFormats::end() const\n+ * \\fn const_iterator ImageFormatsMap::end() const\n * \\brief Retrieve a const iterator pointing to the past-the-end element in the\n * formats map\n * \\return A const iterator to the element following the last format\n */\n \n /**\n- * \\fn iterator ImageFormats::find(const T format)\n+ * \\fn iterator ImageFormatsMap::find(const T format)\n * \\brief Find an element with key equal to \\a format\n * \\param[in] format The format to search for\n * \\return An iterator to the vector of sizes associated with \\a format\n */\n \n /**\n- * \\fn const_iterator ImageFormats::find(const T format) const\n+ * \\fn const_iterator ImageFormatsMap::find(const T format) const\n * \\brief Find a const element with key equal to \\a format\n * \\param[in] format The format to search for\n * \\return An const iterator to the vector of sizes associated with \\a format\n */\n \n /**\n- * \\fn std::pair ImageFormats::emplace(Args&&... args)\n+ * \\fn std::pair ImageFormatsMap::emplace(Args&&... args)\n * \\brief Insert a new element in the formats map constructed in place with the\n * given \\a args\n * \\param[in] args The argument pack used to construct the new entry in place\n@@ -100,7 +100,7 @@ LOG_DEFINE_CATEGORY(Formats)\n */\n \n /**\n- * \\fn ImageFormats::addFormat(T format, const std::vector &sizes)\n+ * \\fn ImageFormatsMap::addFormat(T format, const std::vector &sizes)\n * \\brief Add a format and corresponding sizes to the description\n * \\param[in] format Pixel format or media bus code to describe\n * \\param[in] sizes List of supported size ranges for the format\n@@ -110,19 +110,19 @@ LOG_DEFINE_CATEGORY(Formats)\n */\n \n /**\n- * \\fn ImageFormats::isEmpty() const\n+ * \\fn ImageFormatsMap::isEmpty() const\n * \\brief Check if the list of devices supported formats is empty\n * \\return True if the list of supported formats is empty\n */\n \n /**\n- * \\fn ImageFormats::formats() const\n+ * \\fn ImageFormatsMap::formats() const\n * \\brief Retrieve a list of all supported image formats\n * \\return List of pixel formats or media bus codes\n */\n \n /**\n- * \\fn ImageFormats::sizes(T format) const\n+ * \\fn ImageFormatsMap::sizes(T format) const\n * \\brief Retrieve all sizes for a specific format\n * \\param[in] format The pixel format or mbus code\n *\n@@ -134,7 +134,7 @@ LOG_DEFINE_CATEGORY(Formats)\n */\n \n /**\n- * \\fn ImageFormats::data() const\n+ * \\fn ImageFormatsMap::data() const\n * \\brief Retrieve the map that associates formats to image sizes\n * \\return The map that associates formats to image sizes\n */\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 64364afb3f7e..e0132113b072 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -65,7 +65,7 @@ double scoreFormat(double desired, double actual)\n \treturn score;\n }\n \n-V4L2DeviceFormat findBestMode(ImageFormats &formatsMap, const Size &req)\n+V4L2DeviceFormat findBestMode(ImageFormatsMap &formatsMap, const Size &req)\n {\n \tdouble bestScore = 9e9, score;\n \tV4L2DeviceFormat bestMode = {};\n@@ -424,7 +424,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t\t * Calculate the best sensor mode we can use based on\n \t\t\t * the user request.\n \t\t\t */\n-\t\t\tImageFormats fmts = data_->unicam_[Unicam::Image].dev()->formats();\n+\t\t\tImageFormatsMap fmts = data_->unicam_[Unicam::Image].dev()->formats();\n \t\t\tV4L2DeviceFormat sensorFormat = findBestMode(fmts, cfg.size);\n \t\t\tPixelFormat sensorPixFormat = sensorFormat.fourcc.toPixelFormat();\n \t\t\tif (cfg.size != sensorFormat.size ||\n@@ -478,7 +478,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n \t\t *\n \t\t */\n \t\tPixelFormat &cfgPixFmt = config_.at(outSize[i].first).pixelFormat;\n-\t\tImageFormats fmts;\n+\t\tImageFormatsMap fmts;\n \n \t\tif (i == maxIndex)\n \t\t\tfmts = data_->isp_[Isp::Output0].dev()->formats();\n@@ -515,7 +515,7 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,\n \tRPiCameraData *data = cameraData(camera);\n \tCameraConfiguration *config = new RPiCameraConfiguration(data);\n \tV4L2DeviceFormat sensorFormat;\n-\tImageFormats fmts;\n+\tImageFormatsMap fmts;\n \n \tif (roles.empty())\n \t\treturn config;\n@@ -602,7 +602,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t}\n \n \t/* First calculate the best sensor mode we can use based on the user request. */\n-\tImageFormats fmts = data->unicam_[Unicam::Image].dev()->formats();\n+\tImageFormatsMap fmts = data->unicam_[Unicam::Image].dev()->formats();\n \tV4L2DeviceFormat sensorFormat = findBestMode(fmts, rawStream ? sensorSize : maxSize);\n \n \t/*\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex f3e03ba60196..62906b560d6a 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -275,7 +275,7 @@ int SimpleCameraData::init()\n \t\t\treturn ret;\n \t\t}\n \n-\t\tImageFormats videoFormats = video_->formats(format.mbus_code);\n+\t\tImageFormatsMap videoFormats = video_->formats(format.mbus_code);\n \n \t\tLOG(SimplePipeline, Debug)\n \t\t\t<< \"Adding configuration for \" << format.size.toString()\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex dbd835f5c5ef..e1b1ae32b821 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -159,7 +159,7 @@ CameraConfiguration *PipelineHandlerUVC::generateConfiguration(Camera *camera,\n \tif (roles.empty())\n \t\treturn config;\n \n-\tImageFormats v4l2Formats = data->video_->formats();\n+\tImageFormatsMap v4l2Formats = data->video_->formats();\n \tstd::map> deviceFormats;\n \tstd::transform(v4l2Formats.begin(), v4l2Formats.end(),\n \t\t std::inserter(deviceFormats, deviceFormats.begin()),\ndiff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\nindex 9fa20e84a904..80db4cda82bb 100644\n--- a/src/libcamera/v4l2_subdevice.cpp\n+++ b/src/libcamera/v4l2_subdevice.cpp\n@@ -320,9 +320,9 @@ int V4L2Subdevice::setSelection(unsigned int pad, unsigned int target,\n *\n * \\return A list of the supported device formats\n */\n-ImageFormats V4L2Subdevice::formats(unsigned int pad)\n+ImageFormatsMap V4L2Subdevice::formats(unsigned int pad)\n {\n-\tImageFormats formats;\n+\tImageFormatsMap formats;\n \n \tif (pad >= entity_->pads().size()) {\n \t\tLOG(V4L2, Error) << \"Invalid pad: \" << pad;\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex ea952444e0ad..b264915cb73a 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -925,9 +925,9 @@ int V4L2VideoDevice::setFormatSingleplane(V4L2DeviceFormat *format)\n *\n * \\return A list of the supported video device formats\n */\n-ImageFormats V4L2VideoDevice::formats(uint32_t code)\n+ImageFormatsMap V4L2VideoDevice::formats(uint32_t code)\n {\n-\tImageFormats formats;\n+\tImageFormatsMap formats;\n \n \tfor (V4L2PixelFormat pixelFormat : enumPixelformats(code)) {\n \t\tstd::vector sizes = enumSizes(pixelFormat);\ndiff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp\nindex f66bb633fb00..adcf5606c961 100644\n--- a/test/v4l2_subdevice/list_formats.cpp\n+++ b/test/v4l2_subdevice/list_formats.cpp\n@@ -48,7 +48,7 @@ void ListFormatsTest::printFormats(unsigned int pad,\n int ListFormatsTest::run()\n {\n \t/* List all formats available on existing \"Scaler\" pads. */\n-\tImageFormats formats;\n+\tImageFormatsMap formats;\n \n \tformats = scaler_->formats(0);\n \tif (formats.isEmpty()) {\n","prefixes":["libcamera-devel","3/5"]}