Add different YCbCr encodings.
authorJyri Sarha <jsarha@ti.com>
Tue, 9 May 2017 14:37:15 +0000 (17:37 +0300)
committerJyri Sarha <jsarha@ti.com>
Wed, 31 May 2017 15:49:29 +0000 (18:49 +0300)
kms++util/inc/kms++util/color.h
kms++util/inc/kms++util/kms++util.h
kms++util/src/color.cpp
kms++util/src/testpat.cpp
py/pykms/pykmsutil.cpp

index ba2ed252a4eb6e359e79a113862ede912f83ffc8..f378433dc6f55d61a594eda36e2ca5b33fd57e3c 100644 (file)
@@ -6,6 +6,14 @@ namespace kms
 {
 struct YUV;
 
+enum class YUVType {
+       BT601_Lim = 0,
+       BT601_Full,
+       BT709_Lim,
+       BT709_Full,
+       MAX,
+};
+
 struct RGB
 {
        RGB();
@@ -19,7 +27,7 @@ struct RGB
        uint32_t abgr8888() const;
        uint16_t rgb565() const;
        uint16_t bgr565() const;
-       YUV yuv() const;
+       YUV yuv(YUVType type = YUVType::BT601_Lim) const;
 
        uint8_t b;
        uint8_t g;
@@ -31,7 +39,7 @@ struct YUV
 {
        YUV();
        YUV(uint8_t y, uint8_t u, uint8_t v);
-       YUV(const RGB& rgb);
+       YUV(const RGB& rgb, YUVType type = YUVType::BT601_Lim);
 
        uint8_t v;
        uint8_t u;
index c1e3c8c90963b0a9624e023b3d6df2ffdfa4601f..d45497ec2b2b6791a66aaf14c5a76323f93fbe08 100644 (file)
@@ -26,7 +26,7 @@ void draw_text(IMappedFramebuffer& buf, uint32_t x, uint32_t y, const std::strin
 
 void draw_color_bar(IMappedFramebuffer& buf, int old_xpos, int xpos, int width);
 
-void draw_test_pattern(IMappedFramebuffer &fb);
+void draw_test_pattern(IMappedFramebuffer &fb, YUVType yuvt = YUVType::BT601_Lim);
 }
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
index ae8a4b4421644ded30e5fcb014870723f981afaa..2e6f217e8fd723c79298fe639bc6b6ce6bceb7f0 100644 (file)
@@ -59,11 +59,40 @@ uint16_t RGB::bgr565() const
        return ((b >> 3) << 11) | ((g >> 2) << 5) | ((r >> 3) << 0);
 }
 
-YUV RGB::yuv() const
-{
-       return YUV(*this);
-}
-
+YUV RGB::yuv(YUVType type) const
+{
+       return YUV(*this, type);
+}
+
+#define CF_ONE (256)
+#define CF(a, b, c) { ((int) ((a) * CF_ONE)), ((int) ((b) * CF_ONE)), ((int) ((c) * CF_ONE)) }
+#define CLAMP(a) ((a) > (CF_ONE-1) ? (CF_ONE-1) : (a) < 0 ? 0 : (a))
+
+const int YUVcoef[static_cast<unsigned>(YUVType::MAX)][3][3] = {
+       [static_cast<unsigned>(YUVType::BT601_Lim)] = {
+               CF( 0.257,  0.504,  0.098),
+               CF(-0.148, -0.291,  0.439),
+               CF( 0.439, -0.368, -0.071) },
+       [static_cast<unsigned>(YUVType::BT601_Full)] = {
+               CF( 0.299,  0.587,  0.114),
+               CF(-0.169, -0.331,  0.500),
+               CF( 0.500, -0.419, -0.081) },
+       [static_cast<unsigned>(YUVType::BT709_Lim)] = {
+               CF( 0.1826,  0.6142,  0.0620),
+               CF(-0.1006, -0.3386,  0.4392),
+               CF( 0.4392, -0.3989, -0.0403) },
+       [static_cast<unsigned>(YUVType::BT709_Full)] = {
+               CF( 0.2126,  0.7152,  0.0722),
+               CF(-0.1146, -0.3854,  0.5000),
+               CF( 0.5000, -0.4542, -0.0468) },
+};
+
+const int YUVoffset[static_cast<unsigned>(YUVType::MAX)][3] = {
+       [static_cast<unsigned>(YUVType::BT601_Lim)]  = CF(0.0625,  0.5,  0.5),
+       [static_cast<unsigned>(YUVType::BT601_Full)] = CF(     0,  0.5,  0.5),
+       [static_cast<unsigned>(YUVType::BT709_Lim)]  = CF(0.0625,  0.5,  0.5),
+       [static_cast<unsigned>(YUVType::BT709_Full)] = CF(     0,  0.5,  0.5),
+};
 
 YUV::YUV()
 {
@@ -78,26 +107,41 @@ YUV::YUV(uint8_t y, uint8_t u, uint8_t v)
        this->a = 0;
 }
 
-static inline uint8_t MAKE_YUV_601_Y(uint8_t r, uint8_t g, uint8_t b)
+static inline
+uint8_t MAKE_YUV_Y(uint8_t r, uint8_t g, uint8_t b, YUVType type)
 {
-       return (((66 * r + 129 * g +  25 * b + 128) >> 8) + 16);
+       unsigned tidx = static_cast<unsigned>(type);
+
+       return CLAMP(((YUVcoef[tidx][0][0] * r + YUVcoef[tidx][0][1] * g +
+                     YUVcoef[tidx][0][2] * b + CF_ONE/2) / CF_ONE) +
+                    YUVoffset[tidx][0]);
 }
 
-static inline uint8_t MAKE_YUV_601_U(uint8_t r, uint8_t g, uint8_t b)
+static inline
+uint8_t MAKE_YUV_U(uint8_t r, uint8_t g, uint8_t b, YUVType type)
 {
-       return (((-38 * r -  74 * g + 112 * b + 128) >> 8) + 128);
+       unsigned tidx = static_cast<unsigned>(type);
+
+       return CLAMP(((YUVcoef[tidx][1][0] * r + YUVcoef[tidx][1][1] * g +
+                      YUVcoef[tidx][1][2] * b + CF_ONE/2) / CF_ONE) +
+                    YUVoffset[tidx][1]);
 }
 
-static inline uint8_t MAKE_YUV_601_V(uint8_t r, uint8_t g, uint8_t b)
+static inline
+uint8_t MAKE_YUV_V(uint8_t r, uint8_t g, uint8_t b, YUVType type)
 {
-       return (((112 * r -  94 * g -  18 * b + 128) >> 8) + 128);
+       unsigned tidx = static_cast<unsigned>(type);
+
+       return CLAMP(((YUVcoef[tidx][2][0] * r + YUVcoef[tidx][2][1] * g +
+                      YUVcoef[tidx][2][2] * b + CF_ONE/2) / CF_ONE) +
+                    YUVoffset[tidx][2]);
 }
 
-YUV::YUV(const RGB& rgb)
+YUV::YUV(const RGB& rgb, YUVType type)
 {
-       this->y = MAKE_YUV_601_Y(rgb.r, rgb.g, rgb.b);
-       this->u = MAKE_YUV_601_U(rgb.r, rgb.g, rgb.b);
-       this->v = MAKE_YUV_601_V(rgb.r, rgb.g, rgb.b);
+       this->y = MAKE_YUV_Y(rgb.r, rgb.g, rgb.b, type);
+       this->u = MAKE_YUV_U(rgb.r, rgb.g, rgb.b, type);
+       this->v = MAKE_YUV_V(rgb.r, rgb.g, rgb.b, type);
        this->a = rgb.a;
 }
 }
index fbe3b2e2e47c227b2cae84cbd73784e1d2ab4914..dbd8fe69e583c37d310869933bf8bb9ceb1d6d3d 100644 (file)
@@ -97,7 +97,7 @@ static RGB get_test_pattern_pixel(IMappedFramebuffer& fb, unsigned x, unsigned y
        }
 }
 
-static void draw_test_pattern_part(IMappedFramebuffer& fb, unsigned start_y, unsigned end_y)
+static void draw_test_pattern_part(IMappedFramebuffer& fb, unsigned start_y, unsigned end_y, YUVType yuvt)
 {
        unsigned x, y;
        unsigned w = fb.width();
@@ -127,7 +127,7 @@ static void draw_test_pattern_part(IMappedFramebuffer& fb, unsigned start_y, uns
                        for (x = 0; x < w; x += 2) {
                                RGB pixel1 = get_test_pattern_pixel(fb, x, y);
                                RGB pixel2 = get_test_pattern_pixel(fb, x + 1, y);
-                               draw_yuv422_macropixel(fb, x, y, pixel1.yuv(), pixel2.yuv());
+                               draw_yuv422_macropixel(fb, x, y, pixel1.yuv(yuvt), pixel2.yuv(yuvt));
                        }
                }
                break;
@@ -141,8 +141,8 @@ static void draw_test_pattern_part(IMappedFramebuffer& fb, unsigned start_y, uns
                                RGB pixel01 = get_test_pattern_pixel(fb, x, y + 1);
                                RGB pixel11 = get_test_pattern_pixel(fb, x + 1, y + 1);
                                draw_yuv420_macropixel(fb, x, y,
-                                                      pixel00.yuv(), pixel10.yuv(),
-                                                      pixel01.yuv(), pixel11.yuv());
+                                                      pixel00.yuv(yuvt), pixel10.yuv(yuvt),
+                                                      pixel01.yuv(yuvt), pixel11.yuv(yuvt));
                        }
                }
                break;
@@ -151,10 +151,10 @@ static void draw_test_pattern_part(IMappedFramebuffer& fb, unsigned start_y, uns
        }
 }
 
-static void draw_test_pattern_impl(IMappedFramebuffer& fb)
+static void draw_test_pattern_impl(IMappedFramebuffer& fb, YUVType yuvt)
 {
        if (fb.height() < 20) {
-               draw_test_pattern_part(fb, 0, fb.height());
+               draw_test_pattern_part(fb, 0, fb.height(), yuvt);
                return;
        }
 
@@ -174,21 +174,21 @@ static void draw_test_pattern_impl(IMappedFramebuffer& fb)
                if (n == num_threads - 1)
                        end = fb.height();
 
-               workers.push_back(thread([&fb, start, end]() { draw_test_pattern_part(fb, start, end); }));
+               workers.push_back(thread([&fb, start, end, yuvt]() { draw_test_pattern_part(fb, start, end, yuvt); }));
        }
 
        for (thread& t : workers)
                t.join();
 }
 
-void draw_test_pattern(IMappedFramebuffer &fb)
+void draw_test_pattern(IMappedFramebuffer &fb, YUVType yuvt)
 {
 #ifdef DRAW_PERF_PRINT
        Stopwatch sw;
        sw.start();
 #endif
 
-       draw_test_pattern_impl(fb);
+       draw_test_pattern_impl(fb, yuvt);
 
 #ifdef DRAW_PERF_PRINT
        double us = sw.elapsed_us();
index cb09dea0ab96285d72c31a1dbb49c1470e208f47..a5a6041a22ebf40c38ce8ee1522973a8ffe7d942 100644 (file)
@@ -40,9 +40,17 @@ void init_pykmstest(py::module &m)
                             py::arg("crtc"),
                             py::arg("format") = PixelFormat::Undefined)
                        ;
+       py::enum_<YUVType>(m, "YUVType")
+                       .value("BT601_Lim", YUVType::BT601_Lim)
+                       .value("BT601_Full", YUVType::BT601_Full)
+                       .value("BT709_Lim", YUVType::BT709_Lim)
+                       .value("BT709_Full", YUVType::BT709_Full)
+                       ;
 
        // Use lambdas to handle IMappedFramebuffer
-       m.def("draw_test_pattern", [](MappedFramebuffer& fb) { draw_test_pattern(fb); } );
+       m.def("draw_test_pattern", [](MappedFramebuffer& fb, YUVType yuvt) { draw_test_pattern(fb, yuvt); },
+             py::arg("fb"),
+             py::arg("yuvt") = YUVType::BT601_Lim);
        m.def("draw_color_bar", [](MappedFramebuffer& fb, int old_xpos, int xpos, int width) {
                draw_color_bar(fb, old_xpos, xpos, width);
        } );