Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / media / common / v4l2-tpg / v4l2-tpg-core.c

diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
index 3ec3ceb..1684810 100644 (file)
--- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
+++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c
@@ -504,14 +504,14 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b,
 #define COEFF(v, r) ((int)(0.5 + (v) * (r) * 256.0))
 
        static const int bt601[3][3] = {
-               { COEFF(0.299, 219),  COEFF(0.587, 219),  COEFF(0.114, 219)  },
-               { COEFF(-0.169, 224), COEFF(-0.331, 224), COEFF(0.5, 224)    },
-               { COEFF(0.5, 224),    COEFF(-0.419, 224), COEFF(-0.081, 224) },
+               { COEFF(0.299, 219),   COEFF(0.587, 219),   COEFF(0.114, 219)   },
+               { COEFF(-0.1687, 224), COEFF(-0.3313, 224), COEFF(0.5, 224)     },
+               { COEFF(0.5, 224),     COEFF(-0.4187, 224), COEFF(-0.0813, 224) },
        };
        static const int bt601_full[3][3] = {
-               { COEFF(0.299, 255),  COEFF(0.587, 255),  COEFF(0.114, 255)  },
-               { COEFF(-0.169, 255), COEFF(-0.331, 255), COEFF(0.5, 255)    },
-               { COEFF(0.5, 255),    COEFF(-0.419, 255), COEFF(-0.081, 255) },
+               { COEFF(0.299, 255),   COEFF(0.587, 255),   COEFF(0.114, 255)   },
+               { COEFF(-0.1687, 255), COEFF(-0.3313, 255), COEFF(0.5, 255)     },
+               { COEFF(0.5, 255),     COEFF(-0.4187, 255), COEFF(-0.0813, 255) },
        };
        static const int rec709[3][3] = {
                { COEFF(0.2126, 219),  COEFF(0.7152, 219),  COEFF(0.0722, 219)  },
@@ -558,7 +558,6 @@ static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b,
 
        switch (tpg->real_ycbcr_enc) {
        case V4L2_YCBCR_ENC_601:
-       case V4L2_YCBCR_ENC_SYCC:
                rgb2ycbcr(full ? bt601_full : bt601, r, g, b, y_offset, y, cb, cr);
                break;
        case V4L2_YCBCR_ENC_XV601:
@@ -674,7 +673,6 @@ static void ycbcr_to_color(struct tpg_data *tpg, int y, int cb, int cr,
 
        switch (tpg->real_ycbcr_enc) {
        case V4L2_YCBCR_ENC_601:
-       case V4L2_YCBCR_ENC_SYCC:
                ycbcr2rgb(full ? bt601_full : bt601, y, cb, cr, y_offset, r, g, b);
                break;
        case V4L2_YCBCR_ENC_XV601: