diff options
| -rw-r--r-- | kms++/inc/kms++/extframebuffer.h | 4 | ||||
| -rw-r--r-- | kms++/src/extframebuffer.cpp | 8 | ||||
| -rw-r--r-- | kmscube/cube-gbm.cpp | 6 | ||||
| -rw-r--r-- | utils/kmscapture.cpp | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h index 89551c3..cee82d3 100644 --- a/kms++/inc/kms++/extframebuffer.h +++ b/kms++/inc/kms++/extframebuffer.h @@ -10,9 +10,9 @@ class ExtFramebuffer : public MappedFramebuffer { public: ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - uint32_t handles[4], uint32_t pitches[4], uint32_t offsets[4]); + std::vector<uint32_t> handles, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets); ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - int fds[4], uint32_t pitches[4], uint32_t offsets[4]); + std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets); virtual ~ExtFramebuffer(); uint32_t width() const { return Framebuffer::width(); } diff --git a/kms++/src/extframebuffer.cpp b/kms++/src/extframebuffer.cpp index 2f23a33..51f3611 100644 --- a/kms++/src/extframebuffer.cpp +++ b/kms++/src/extframebuffer.cpp @@ -13,7 +13,7 @@ namespace kms { ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - uint32_t handles[], uint32_t pitches[], uint32_t offsets[]) + vector<uint32_t> handles, vector<uint32_t> pitches, vector<uint32_t> offsets) : MappedFramebuffer(card, width, height) { m_format = format; @@ -35,7 +35,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe } uint32_t id; - int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles, pitches, offsets, &id, 0); + int r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, handles.data(), pitches.data(), offsets.data(), &id, 0); if (r) throw std::invalid_argument(string("Failed to create ExtFramebuffer: ") + strerror(r)); @@ -43,7 +43,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe } ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format, - int fds[4], uint32_t pitches[4], uint32_t offsets[4]) + vector<int> fds, vector<uint32_t> pitches, vector<uint32_t> offsets) : MappedFramebuffer(card, width, height) { int r; @@ -72,7 +72,7 @@ ExtFramebuffer::ExtFramebuffer(Card& card, uint32_t width, uint32_t height, Pixe uint32_t id; uint32_t bo_handles[4] = { m_planes[0].handle, m_planes[1].handle }; r = drmModeAddFB2(card.fd(), width, height, (uint32_t)format, - bo_handles, pitches, offsets, &id, 0); + bo_handles, pitches.data(), offsets.data(), &id, 0); if (r) throw invalid_argument(string("drmModeAddFB2 failed: ") + strerror(errno)); diff --git a/kmscube/cube-gbm.cpp b/kmscube/cube-gbm.cpp index 993434b..07413ab 100644 --- a/kmscube/cube-gbm.cpp +++ b/kmscube/cube-gbm.cpp @@ -134,9 +134,9 @@ public: uint32_t handle = gbm_bo_get_handle(bo).u32; PixelFormat format = (PixelFormat)gbm_bo_get_format(bo); - uint32_t handles[4] { handle }; - uint32_t strides[4] { stride }; - uint32_t offsets[4] { 0 }; + vector<uint32_t> handles { handle }; + vector<uint32_t> strides { stride }; + vector<uint32_t> offsets { 0 }; fb = new ExtFramebuffer(card, width, height, format, handles, strides, offsets); diff --git a/utils/kmscapture.cpp b/utils/kmscapture.cpp index b4c3e88..43ef989 100644 --- a/utils/kmscapture.cpp +++ b/utils/kmscapture.cpp @@ -83,9 +83,9 @@ ExtFramebuffer* CameraPipeline::GetExtFrameBuffer(Card& card, uint32_t i, PixelF const PixelFormatInfo& format_info = get_pixel_format_info(pixfmt); ASSERT(format_info.num_planes == 1); - uint32_t handles[4] { handle }; - uint32_t pitches[4] { m_in_width * (format_info.planes[0].bitspp / 8) }; - uint32_t offsets[4] { }; + vector<uint32_t> handles { handle }; + vector<uint32_t> pitches { m_in_width * (format_info.planes[0].bitspp / 8) }; + vector<uint32_t> offsets { }; return new ExtFramebuffer(card, m_in_width, m_in_height, pixfmt, handles, pitches, offsets); |