summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vivid/vivid-tpg.c
diff options
context:
space:
mode:
authorHans Verkuil2015-04-28 15:08:43 +0200
committerMauro Carvalho Chehab2015-06-05 16:50:36 +0200
commit78aad7f81aa6dfccdb2804ac35db6fc371d265cf (patch)
tree4baefbadfce0a0fb596001cc6839c717e02fe8c0 /drivers/media/platform/vivid/vivid-tpg.c
parent[media] vivid: add xfer_func support (diff)
downloadkernel-qcow2-linux-78aad7f81aa6dfccdb2804ac35db6fc371d265cf.tar.gz
kernel-qcow2-linux-78aad7f81aa6dfccdb2804ac35db6fc371d265cf.tar.xz
kernel-qcow2-linux-78aad7f81aa6dfccdb2804ac35db6fc371d265cf.zip
[media] vivid-tpg: precalculate colorspace/xfer_func combinations
Precalculate all the colorspace/transfer function combinations in order to easily generate the correct colors. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-tpg.c')
-rw-r--r--drivers/media/platform/vivid/vivid-tpg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/vivid/vivid-tpg.c b/drivers/media/platform/vivid/vivid-tpg.c
index c1883a8533c5..c86c8ffcf9c7 100644
--- a/drivers/media/platform/vivid/vivid-tpg.c
+++ b/drivers/media/platform/vivid/vivid-tpg.c
@@ -706,9 +706,9 @@ static void precalculate_color(struct tpg_data *tpg, int k)
}
if (tpg->pattern == TPG_PAT_CSC_COLORBAR && col <= TPG_COLOR_CSC_BLACK) {
- r = tpg_csc_colors[tpg->colorspace][col].r;
- g = tpg_csc_colors[tpg->colorspace][col].g;
- b = tpg_csc_colors[tpg->colorspace][col].b;
+ r = tpg_csc_colors[tpg->colorspace][tpg->real_xfer_func][col].r;
+ g = tpg_csc_colors[tpg->colorspace][tpg->real_xfer_func][col].g;
+ b = tpg_csc_colors[tpg->colorspace][tpg->real_xfer_func][col].b;
} else {
r <<= 4;
g <<= 4;