summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-04-29 04:31:48 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-05-04 14:11:31 +0300
commitd5d6dbe85cf270aee7c956429a5a692feca3900f (patch)
tree05a91c081e0c5685f76984ca45f3ff833e64eff9
parent08d613311371ef26da7b6c226d1e35d12be0ca32 (diff)
libcamera: Add operator<<() for V4L2 format classes
Implement the stream output operator<<() for the V4L2DeviceFormat and V4L2SubdeviceFormat classes to simplify printing them. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--include/libcamera/internal/v4l2_subdevice.h3
-rw-r--r--include/libcamera/internal/v4l2_videodevice.h3
-rw-r--r--src/libcamera/v4l2_subdevice.cpp34
-rw-r--r--src/libcamera/v4l2_videodevice.cpp16
4 files changed, 45 insertions, 11 deletions
diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h
index 58d1e511..6fda52ad 100644
--- a/include/libcamera/internal/v4l2_subdevice.h
+++ b/include/libcamera/internal/v4l2_subdevice.h
@@ -9,6 +9,7 @@
#include <memory>
#include <optional>
+#include <ostream>
#include <string>
#include <vector>
@@ -35,6 +36,8 @@ struct V4L2SubdeviceFormat {
uint8_t bitsPerPixel() const;
};
+std::ostream &operator<<(std::ostream &out, const V4L2SubdeviceFormat &f);
+
class V4L2Subdevice : public V4L2Device
{
public:
diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h
index 9c9493cc..23f37f83 100644
--- a/include/libcamera/internal/v4l2_videodevice.h
+++ b/include/libcamera/internal/v4l2_videodevice.h
@@ -11,6 +11,7 @@
#include <atomic>
#include <memory>
#include <optional>
+#include <ostream>
#include <stdint.h>
#include <string>
#include <vector>
@@ -180,6 +181,8 @@ public:
const std::string toString() const;
};
+std::ostream &operator<<(std::ostream &out, const V4L2DeviceFormat &f);
+
class V4L2VideoDevice : public V4L2Device
{
public:
diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp
index d5ae4605..b3d0ddad 100644
--- a/src/libcamera/v4l2_subdevice.cpp
+++ b/src/libcamera/v4l2_subdevice.cpp
@@ -190,17 +190,10 @@ const std::map<uint32_t, V4L2SubdeviceFormatInfo> formatInfoMap = {
*/
const std::string V4L2SubdeviceFormat::toString() const
{
- std::stringstream mbus;
- mbus << size << "-";
+ std::stringstream ss;
+ ss << *this;
- const auto it = formatInfoMap.find(mbus_code);
-
- if (it == formatInfoMap.end())
- mbus << utils::hex(mbus_code, 4);
- else
- mbus << it->second.name;
-
- return mbus.str();
+ return ss.str();
}
/**
@@ -221,6 +214,27 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const
}
/**
+ * \brief Insert a text representation of a V4L2SubdeviceFormat into an output
+ * stream
+ * \param[in] out The output stream
+ * \param[in] f The V4L2SubdeviceFormat
+ * \return The output stream \a out
+ */
+std::ostream &operator<<(std::ostream &out, const V4L2SubdeviceFormat &f)
+{
+ out << f.size << "-";
+
+ const auto it = formatInfoMap.find(f.mbus_code);
+
+ if (it == formatInfoMap.end())
+ out << utils::hex(f.mbus_code, 4);
+ else
+ out << it->second.name;
+
+ return out;
+}
+
+/**
* \class V4L2Subdevice
* \brief A V4L2 subdevice as exposed by the Linux kernel
*
diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp
index 5ba866ad..5b4637b1 100644
--- a/src/libcamera/v4l2_videodevice.cpp
+++ b/src/libcamera/v4l2_videodevice.cpp
@@ -433,11 +433,25 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const
const std::string V4L2DeviceFormat::toString() const
{
std::stringstream ss;
- ss << size << "-" << fourcc.toString();
+ ss << *this;
+
return ss.str();
}
/**
+ * \brief Insert a text representation of a V4L2DeviceFormat into an output
+ * stream
+ * \param[in] out The output stream
+ * \param[in] f The V4L2DeviceFormat
+ * \return The output stream \a out
+ */
+std::ostream &operator<<(std::ostream &out, const V4L2DeviceFormat &f)
+{
+ out << f.size << "-" << f.fourcc;
+ return out;
+}
+
+/**
* \class V4L2VideoDevice
* \brief V4L2VideoDevice object and API
*