OSDN Git Service

[media] vivid-tpg: add full range BT.2020 support
authorHans Verkuil <hans.verkuil@cisco.com>
Fri, 24 Apr 2015 14:16:24 +0000 (11:16 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 28 Apr 2015 12:21:24 +0000 (09:21 -0300)
In order to be consistent with the other Y'CbCr encodings add
support for full range V4L2_YCBCR_ENC_BT2020.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/vivid/vivid-tpg.c

index 59bdbae..a7ead15 100644 (file)
@@ -489,6 +489,12 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b,
                { COEFF(-0.1396, 224), COEFF(-0.3604, 224), COEFF(0.5, 224)     },
                { COEFF(0.5, 224),     COEFF(-0.4598, 224), COEFF(-0.0402, 224) },
        };
+       static const int bt2020_full[3][3] = {
+               { COEFF(0.2627, 255),  COEFF(0.6780, 255),  COEFF(0.0593, 255)  },
+               { COEFF(-0.1396, 255), COEFF(-0.3604, 255), COEFF(0.5, 255)     },
+               { COEFF(0.5, 255),     COEFF(-0.4698, 255), COEFF(-0.0402, 255) },
+       };
+
        bool full = tpg->real_quantization == V4L2_QUANTIZATION_FULL_RANGE;
        unsigned y_offset = full ? 0 : 16;
        int lin_y, yc;
@@ -500,7 +506,7 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b,
                rgb2ycbcr(full ? bt601_full : bt601, r, g, b, y_offset, y, cb, cr);
                break;
        case V4L2_YCBCR_ENC_BT2020:
-               rgb2ycbcr(bt2020, r, g, b, 16, y, cb, cr);
+               rgb2ycbcr(full ? bt2020_full : bt2020, r, g, b, y_offset, y, cb, cr);
                break;
        case V4L2_YCBCR_ENC_BT2020_CONST_LUM:
                lin_y = (COEFF(0.2627, 255) * rec709_to_linear(r) +
@@ -582,6 +588,11 @@ static void ycbcr_to_color(struct tpg_data *tpg, int y, int cb, int cr,
                { COEFF(1, 219), COEFF(-0.1646, 224), COEFF(-0.5714, 224) },
                { COEFF(1, 219), COEFF(1.8814, 224),  COEFF(0, 224)       },
        };
+       static const int bt2020_full[3][3] = {
+               { COEFF(1, 255), COEFF(0, 255),       COEFF(1.4746, 255)  },
+               { COEFF(1, 255), COEFF(-0.1646, 255), COEFF(-0.5714, 255) },
+               { COEFF(1, 255), COEFF(1.8814, 255),  COEFF(0, 255)       },
+       };
        bool full = tpg->real_quantization == V4L2_QUANTIZATION_FULL_RANGE;
        unsigned y_offset = full ? 0 : 16;
        int lin_r, lin_g, lin_b, lin_y;
@@ -593,7 +604,7 @@ static void ycbcr_to_color(struct tpg_data *tpg, int y, int cb, int cr,
                ycbcr2rgb(full ? bt601_full : bt601, y, cb, cr, y_offset, r, g, b);
                break;
        case V4L2_YCBCR_ENC_BT2020:
-               ycbcr2rgb(bt2020, y, cb, cr, 16, r, g, b);
+               ycbcr2rgb(full ? bt2020_full : bt2020, y, cb, cr, y_offset, r, g, b);
                break;
        case V4L2_YCBCR_ENC_BT2020_CONST_LUM:
                y -= 16 << 4;