From 08a75925d86605d63f115e76ad7644ba194812a4 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 22 May 2020 03:08:15 +0300
Subject: libcamera: Rename pixelformats.{cpp,h} to pixel_format.{cpp,h}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The libcamera source files are named after class names, using
snake_case. pixelformats.h and pixelformats.cpp don't comply with that
rule. Fix them.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
src/libcamera/meson.build | 2 +-
src/libcamera/pipeline/simple/converter.h | 2 +-
src/libcamera/pixel_format.cpp | 116 ++++++++++++++++++++++++++++++
src/libcamera/pixelformats.cpp | 116 ------------------------------
src/libcamera/v4l2_pixelformat.cpp | 2 +-
src/qcam/format_converter.h | 2 +-
src/qcam/viewfinder.h | 2 +-
7 files changed, 121 insertions(+), 121 deletions(-)
create mode 100644 src/libcamera/pixel_format.cpp
delete mode 100644 src/libcamera/pixelformats.cpp
(limited to 'src')
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index b88f295d..611fc061 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -34,7 +34,7 @@ libcamera_sources = files([
'message.cpp',
'object.cpp',
'pipeline_handler.cpp',
- 'pixelformats.cpp',
+ 'pixel_format.cpp',
'process.cpp',
'pub_key.cpp',
'request.cpp',
diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h
index 1f770eb8..ef18cf73 100644
--- a/src/libcamera/pipeline/simple/converter.h
+++ b/src/libcamera/pipeline/simple/converter.h
@@ -12,7 +12,7 @@
#include <queue>
#include <vector>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
#include <libcamera/signal.h>
namespace libcamera {
diff --git a/src/libcamera/pixel_format.cpp b/src/libcamera/pixel_format.cpp
new file mode 100644
index 00000000..d8718739
--- /dev/null
+++ b/src/libcamera/pixel_format.cpp
@@ -0,0 +1,116 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2019, Google Inc.
+ *
+ * pixel_format.cpp - libcamera Pixel Format
+ */
+
+#include <libcamera/pixel_format.h>
+
+/**
+ * \file pixel_format.h
+ * \brief libcamera pixel format
+ */
+
+namespace libcamera {
+
+/**
+ * \class PixelFormat
+ * \brief libcamera image pixel format
+ *
+ * The PixelFormat type describes the format of images in the public libcamera
+ * API. It stores a FourCC value as a 32-bit unsigned integer and a modifier.
+ * The FourCC and modifier values are defined in the Linux kernel DRM/KMS API
+ * (see linux/drm_fourcc.h).
+ */
+
+/**
+ * \brief Construct a PixelFormat with an invalid format
+ *
+ * PixelFormat instances constructed with the default constructor are
+ * invalid, calling the isValid() function returns false.
+ */
+PixelFormat::PixelFormat()
+ : fourcc_(0)
+{
+}
+
+/**
+ * \brief Construct a PixelFormat from a DRM FourCC and a modifier
+ * \param[in] fourcc A DRM FourCC
+ * \param[in] modifier A DRM FourCC modifier
+ */
+PixelFormat::PixelFormat(uint32_t fourcc, uint64_t modifier)
+ : fourcc_(fourcc), modifier_(modifier)
+{
+}
+
+/**
+ * \brief Compare pixel formats for equality
+ * \return True if the two pixel formats are equal, false otherwise
+ */
+bool PixelFormat::operator==(const PixelFormat &other) const
+{
+ return fourcc_ == other.fourcc() && modifier_ == other.modifier_;
+}
+
+/**
+ * \fn bool PixelFormat::operator!=(const PixelFormat &other) const
+ * \brief Compare pixel formats for inequality
+ * \return True if the two pixel formats are not equal, false otherwise
+ */
+
+/**
+ * \brief Compare pixel formats for smaller than order
+ * \return True if \a this is smaller than \a other, false otherwise
+ */
+bool PixelFormat::operator<(const PixelFormat &other) const
+{
+ if (fourcc_ < other.fourcc_)
+ return true;
+ if (fourcc_ > other.fourcc_)
+ return false;
+ return modifier_ < other.modifier_;
+}
+
+/**
+ * \fn bool PixelFormat::isValid() const
+ * \brief Check if the pixel format is valid
+ *
+ * PixelFormat instances constructed with the default constructor are
+ * invalid. Instances constructed with a FourCC defined in the DRM API
+ * are valid. The behaviour is undefined otherwise.
+ *
+ * \return True if the pixel format is valid, false otherwise
+ */
+
+/**
+ * \fn PixelFormat::operator uint32_t() const
+ * \brief Convert the the pixel format numerical value
+ * \return The pixel format numerical value
+ */
+
+/**
+ * \fn PixelFormat::fourcc() const
+ * \brief Retrieve the pixel format FourCC
+ * \return DRM FourCC
+ */
+
+/**
+ * \fn PixelFormat::modifier() const
+ * \brief Retrieve the pixel format modifier
+ * \return DRM modifier
+ */
+
+/**
+ * \brief Assemble and return a string describing the pixel format
+ * \return A string describing the pixel format
+ */
+std::string PixelFormat::toString() const
+{
+ char str[11];
+ snprintf(str, 11, "0x%08x", fourcc_);
+ return str;
+}
+
+} /* namespace libcamera */
diff --git a/src/libcamera/pixelformats.cpp b/src/libcamera/pixelformats.cpp
deleted file mode 100644
index 1330dc5a..00000000
--- a/src/libcamera/pixelformats.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2019, Google Inc.
- *
- * pixelformats.cpp - libcamera pixel formats
- */
-
-#include <libcamera/pixelformats.h>
-
-/**
- * \file pixelformats.h
- * \brief libcamera pixel formats
- */
-
-namespace libcamera {
-
-/**
- * \class PixelFormat
- * \brief libcamera image pixel format
- *
- * The PixelFormat type describes the format of images in the public libcamera
- * API. It stores a FourCC value as a 32-bit unsigned integer and a modifier.
- * The FourCC and modifier values are defined in the Linux kernel DRM/KMS API
- * (see linux/drm_fourcc.h).
- */
-
-/**
- * \brief Construct a PixelFormat with an invalid format
- *
- * PixelFormat instances constructed with the default constructor are
- * invalid, calling the isValid() function returns false.
- */
-PixelFormat::PixelFormat()
- : fourcc_(0)
-{
-}
-
-/**
- * \brief Construct a PixelFormat from a DRM FourCC and a modifier
- * \param[in] fourcc A DRM FourCC
- * \param[in] modifier A DRM FourCC modifier
- */
-PixelFormat::PixelFormat(uint32_t fourcc, uint64_t modifier)
- : fourcc_(fourcc), modifier_(modifier)
-{
-}
-
-/**
- * \brief Compare pixel formats for equality
- * \return True if the two pixel formats are equal, false otherwise
- */
-bool PixelFormat::operator==(const PixelFormat &other) const
-{
- return fourcc_ == other.fourcc() && modifier_ == other.modifier_;
-}
-
-/**
- * \fn bool PixelFormat::operator!=(const PixelFormat &other) const
- * \brief Compare pixel formats for inequality
- * \return True if the two pixel formats are not equal, false otherwise
- */
-
-/**
- * \brief Compare pixel formats for smaller than order
- * \return True if \a this is smaller than \a other, false otherwise
- */
-bool PixelFormat::operator<(const PixelFormat &other) const
-{
- if (fourcc_ < other.fourcc_)
- return true;
- if (fourcc_ > other.fourcc_)
- return false;
- return modifier_ < other.modifier_;
-}
-
-/**
- * \fn bool PixelFormat::isValid() const
- * \brief Check if the pixel format is valid
- *
- * PixelFormat instances constructed with the default constructor are
- * invalid. Instances constructed with a FourCC defined in the DRM API
- * are valid. The behaviour is undefined otherwise.
- *
- * \return True if the pixel format is valid, false otherwise
- */
-
-/**
- * \fn PixelFormat::operator uint32_t() const
- * \brief Convert the the pixel format numerical value
- * \return The pixel format numerical value
- */
-
-/**
- * \fn PixelFormat::fourcc() const
- * \brief Retrieve the pixel format FourCC
- * \return DRM FourCC
- */
-
-/**
- * \fn PixelFormat::modifier() const
- * \brief Retrieve the pixel format modifier
- * \return DRM modifier
- */
-
-/**
- * \brief Assemble and return a string describing the pixel format
- * \return A string describing the pixel format
- */
-std::string PixelFormat::toString() const
-{
- char str[11];
- snprintf(str, 11, "0x%08x", fourcc_);
- return str;
-}
-
-} /* namespace libcamera */
diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp
index 36776be9..94fae470 100644
--- a/src/libcamera/v4l2_pixelformat.cpp
+++ b/src/libcamera/v4l2_pixelformat.cpp
@@ -14,7 +14,7 @@
#include <linux/drm_fourcc.h>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
#include "libcamera/internal/formats.h"
#include "libcamera/internal/log.h"
diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h
index 5e28adf0..e389b24a 100644
--- a/src/qcam/format_converter.h
+++ b/src/qcam/format_converter.h
@@ -11,7 +11,7 @@
#include <QSize>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
class QImage;
diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h
index b3f1d25d..26a13205 100644
--- a/src/qcam/viewfinder.h
+++ b/src/qcam/viewfinder.h
@@ -17,7 +17,7 @@
#include <QWidget>
#include <libcamera/buffer.h>
-#include <libcamera/pixelformats.h>
+#include <libcamera/pixel_format.h>
#include "format_converter.h"
--
cgit v1.2.1