diff options
| author | Naushir Patuck <naush@raspberrypi.com> | 2020-09-24 10:19:24 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2020-09-29 12:35:16 +0100 |
| commit | 2ba3c68b6792204384bfe2b573494fc5b9a7b48a (patch) | |
| tree | 606b251c48eaac3d4a718f7dac342d713fba3be5 /src/libcamera/pipeline/raspberrypi/rpi_stream.h | |
| parent | 94b667b43f735fa27d2ded854d112048e5b2dc0d (diff) | |
pipeline: raspberrypi: Rename RPi::RPiStream and RPi::RPiDevice
Rename RPi::RPiStream -> RPi::Stream and RPi::RPiDevice -> RPi::Device.
There are no functional changes in this commit.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/raspberrypi/rpi_stream.h')
| -rw-r--r-- | src/libcamera/pipeline/raspberrypi/rpi_stream.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h index a2c21bcd..cb097e1c 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h @@ -27,15 +27,15 @@ using BufferMap = std::unordered_map<unsigned int, FrameBuffer *>; * Device stream abstraction for either an internal or external stream. * Used for both Unicam and the ISP. */ -class RPiStream : public Stream +class Stream : public libcamera::Stream { public: - RPiStream() + Stream() : id_(RPiBufferMask::ID) { } - RPiStream(const char *name, MediaEntity *dev, bool importOnly = false) + Stream(const char *name, MediaEntity *dev, bool importOnly = false) : external_(false), importOnly_(importOnly), name_(name), dev_(std::make_unique<V4L2VideoDevice>(dev)), id_(RPiBufferMask::ID) { @@ -155,7 +155,7 @@ private: * streams indexed with an enum class. */ template<typename E, std::size_t N> -class RPiDevice : public std::array<class RPiStream, N> +class Device : public std::array<class Stream, N> { private: constexpr auto index(E e) const noexcept @@ -163,13 +163,13 @@ private: return static_cast<std::underlying_type_t<E>>(e); } public: - RPiStream &operator[](E e) + Stream &operator[](E e) { - return std::array<class RPiStream, N>::operator[](index(e)); + return std::array<class Stream, N>::operator[](index(e)); } - const RPiStream &operator[](E e) const + const Stream &operator[](E e) const { - return std::array<class RPiStream, N>::operator[](index(e)); + return std::array<class Stream, N>::operator[](index(e)); } }; |