add public PixelFormatInfo

4 files changed, 56 insertions, 68 deletions

diff --git a/libkms++/dumbframebuffer.cpp b/libkms++/dumbframebuffer.cpp
index 4fae49e..0a05e61 100644
--- a/libkms++/dumbframebuffer.cpp
+++ b/libkms++/dumbframebuffer.cpp
@@ -35,54 +35,23 @@ DumbFramebuffer::~DumbFramebuffer()
 	Destroy();
 }
 
-struct FormatPlaneInfo
-{
-	uint8_t bitspp;	/* bits per (macro) pixel */
-	uint8_t xsub;
-	uint8_t ysub;
-};
-
-struct FormatInfo
-{
-	uint8_t num_planes;
-	struct FormatPlaneInfo planes[4];
-};
-
-static const map<PixelFormat, FormatInfo> format_info_array = {
-	/* YUV packed */
-	{ PixelFormat::UYVY, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::YUYV, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::YVYU, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::VYUY, { 1, { { 32, 2, 1 } }, } },
-	/* YUV semi-planar */
-	{ PixelFormat::NV12, { 2, { { 8, 1, 1, }, { 16, 2, 2 } }, } },
-	{ PixelFormat::NV21, { 2, { { 8, 1, 1, }, { 16, 2, 2 } }, } },
-	/* RGB16 */
-	{ PixelFormat::RGB565, { 1, { { 16, 1, 1 } }, } },
-	/* RGB32 */
-	{ PixelFormat::XRGB8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::XBGR8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::ARGB8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::ABGR8888, { 1, { { 32, 1, 1 } }, } },
-};
-
 void DumbFramebuffer::Create()
 {
 	int r;
 
-	const FormatInfo& format_info = format_info_array.at(m_format);
+	const PixelFormatInfo& format_info = get_pixel_format_info(m_format);
 
 	m_num_planes = format_info.num_planes;
 
 	for (int i = 0; i < format_info.num_planes; ++i) {
-		const FormatPlaneInfo& pi = format_info.planes[i];
+		const PixelFormatPlaneInfo& pi = format_info.planes[i];
 		FramebufferPlane& plane = m_planes[i];
 
 		/* create dumb buffer */
 		struct drm_mode_create_dumb creq = drm_mode_create_dumb();
 		creq.width = width();
 		creq.height = height() / pi.ysub;
-		creq.bpp = pi.bitspp / pi.xsub;
+		creq.bpp = pi.bitspp;
 		r = drmIoctl(card().fd(), DRM_IOCTL_MODE_CREATE_DUMB, &creq);
 		if (r)
 			throw invalid_argument(string("DRM_IOCTL_MODE_CREATE_DUMB failed") + strerror(errno));
diff --git a/libkms++/pixelformats.cpp b/libkms++/pixelformats.cpp
new file mode 100644
index 0000000..594bd6d
--- /dev/null
+++ b/libkms++/pixelformats.cpp
@@ -0,0 +1,32 @@
+#include <map>
+
+#include "pixelformats.h"
+
+using namespace std;
+
+namespace kms
+{
+static const map<PixelFormat, PixelFormatInfo> format_info_array = {
+	/* YUV packed */
+	{ PixelFormat::UYVY, { 1, { { 16, 2, 1 } }, } },
+	{ PixelFormat::YUYV, { 1, { { 16, 2, 1 } }, } },
+	{ PixelFormat::YVYU, { 1, { { 16, 2, 1 } }, } },
+	{ PixelFormat::VYUY, { 1, { { 16, 2, 1 } }, } },
+	/* YUV semi-planar */
+	{ PixelFormat::NV12, { 2, { { 8, 1, 1, }, { 8, 2, 2 } }, } },
+	{ PixelFormat::NV21, { 2, { { 8, 1, 1, }, { 8, 2, 2 } }, } },
+	/* RGB16 */
+	{ PixelFormat::RGB565, { 1, { { 16, 1, 1 } }, } },
+	/* RGB32 */
+	{ PixelFormat::XRGB8888, { 1, { { 32, 1, 1 } }, } },
+	{ PixelFormat::XBGR8888, { 1, { { 32, 1, 1 } }, } },
+	{ PixelFormat::ARGB8888, { 1, { { 32, 1, 1 } }, } },
+	{ PixelFormat::ABGR8888, { 1, { { 32, 1, 1 } }, } },
+};
+
+const struct PixelFormatInfo& get_pixel_format_info(PixelFormat format)
+{
+	return format_info_array.at(format);
+}
+
+}
diff --git a/libkms++/pixelformats.h b/libkms++/pixelformats.h
index d6f41d7..813eaef 100644
--- a/libkms++/pixelformats.h
+++ b/libkms++/pixelformats.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 namespace kms
 {
 constexpr uint32_t MakeFourCC(const char *fourcc)
@@ -42,4 +45,19 @@ static inline std::string PixelFormatToFourCC(PixelFormat f)
 	return std::string(buf);
 }
 
+struct PixelFormatPlaneInfo
+{
+	uint8_t bitspp;
+	uint8_t xsub;
+	uint8_t ysub;
+};
+
+struct PixelFormatInfo
+{
+	uint8_t num_planes;
+	struct PixelFormatPlaneInfo planes[4];
+};
+
+const struct PixelFormatInfo& get_pixel_format_info(PixelFormat format);
+
 }
diff --git a/libkmstest/cpuframebuffer.cpp b/libkmstest/cpuframebuffer.cpp
index 3a9e52d..1f14ddc 100644
--- a/libkmstest/cpuframebuffer.cpp
+++ b/libkmstest/cpuframebuffer.cpp
@@ -6,49 +6,18 @@ using namespace std;
 
 namespace kms {
 
-struct FormatPlaneInfo
-{
-	uint8_t bitspp;	/* bits per (macro) pixel */
-	uint8_t xsub;
-	uint8_t ysub;
-};
-
-struct FormatInfo
-{
-	uint8_t num_planes;
-	struct FormatPlaneInfo planes[4];
-};
-
-static const map<PixelFormat, FormatInfo> format_info_array = {
-	/* YUV packed */
-	{ PixelFormat::UYVY, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::YUYV, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::YVYU, { 1, { { 32, 2, 1 } }, } },
-	{ PixelFormat::VYUY, { 1, { { 32, 2, 1 } }, } },
-	/* YUV semi-planar */
-	{ PixelFormat::NV12, { 2, { { 8, 1, 1, }, { 16, 2, 2 } }, } },
-	{ PixelFormat::NV21, { 2, { { 8, 1, 1, }, { 16, 2, 2 } }, } },
-	/* RGB16 */
-	{ PixelFormat::RGB565, { 1, { { 16, 1, 1 } }, } },
-	/* RGB32 */
-	{ PixelFormat::XRGB8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::XBGR8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::ARGB8888, { 1, { { 32, 1, 1 } }, } },
-	{ PixelFormat::ABGR8888, { 1, { { 32, 1, 1 } }, } },
-};
-
 CPUFramebuffer::CPUFramebuffer(uint32_t width, uint32_t height, PixelFormat format)
 	: m_width(width), m_height(height), m_format(format)
 {
-	const FormatInfo& format_info = format_info_array.at(m_format);
+	const PixelFormatInfo& format_info = get_pixel_format_info(m_format);
 
 	m_num_planes = format_info.num_planes;
 
 	for (unsigned i = 0; i < format_info.num_planes; ++i) {
-		const FormatPlaneInfo& pi = format_info.planes[i];
+		const PixelFormatPlaneInfo& pi = format_info.planes[i];
 		FramebufferPlane& plane = m_planes[i];
 
-		plane.stride = width * pi.bitspp / 8 / pi.xsub;
+		plane.stride = width * pi.bitspp / 8;
 		plane.size = plane.stride * height/ pi.ysub;
 		plane.offset = 0;
 		plane.map = new uint8_t[plane.size];