diff options
| author | Hans Verkuil | 2015-04-28 14:41:37 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-06-05 16:49:53 +0200 |
| commit | ca5316db08199124bf72b0ed16dc1a83fe0609e2 (patch) | |
| tree | c6a2010a586d67b803f17658344f4ff7f6934567 /drivers/media/platform/vivid/vivid-tpg.c | |
| parent | [media] am437x-vpfe: add support for xfer_func (diff) | |
| download | kernel-qcow2-linux-ca5316db08199124bf72b0ed16dc1a83fe0609e2.tar.gz kernel-qcow2-linux-ca5316db08199124bf72b0ed16dc1a83fe0609e2.tar.xz kernel-qcow2-linux-ca5316db08199124bf72b0ed16dc1a83fe0609e2.zip | |
[media] vivid: add xfer_func support
Add support for the transfer function: create a new control for it,
and support it for both capture and output sides.
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.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/platform/vivid/vivid-tpg.c b/drivers/media/platform/vivid/vivid-tpg.c index 7a3ed580626a..c1883a8533c5 100644 --- a/drivers/media/platform/vivid/vivid-tpg.c +++ b/drivers/media/platform/vivid/vivid-tpg.c @@ -1651,8 +1651,14 @@ static void tpg_recalc(struct tpg_data *tpg) if (tpg->recalc_colors) { tpg->recalc_colors = false; tpg->recalc_lines = true; + tpg->real_xfer_func = tpg->xfer_func; tpg->real_ycbcr_enc = tpg->ycbcr_enc; tpg->real_quantization = tpg->quantization; + + if (tpg->xfer_func == V4L2_XFER_FUNC_DEFAULT) + tpg->real_xfer_func = + V4L2_MAP_XFER_FUNC_DEFAULT(tpg->colorspace); + if (tpg->ycbcr_enc == V4L2_YCBCR_ENC_DEFAULT) tpg->real_ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(tpg->colorspace); @@ -1716,6 +1722,7 @@ void tpg_log_status(struct tpg_data *tpg) pr_info("tpg compose: %ux%u@%dx%d\n", tpg->compose.width, tpg->compose.height, tpg->compose.left, tpg->compose.top); pr_info("tpg colorspace: %d\n", tpg->colorspace); + pr_info("tpg transfer function: %d/%d\n", tpg->xfer_func, tpg->real_xfer_func); pr_info("tpg Y'CbCr encoding: %d/%d\n", tpg->ycbcr_enc, tpg->real_ycbcr_enc); pr_info("tpg quantization: %d/%d\n", tpg->quantization, tpg->real_quantization); pr_info("tpg RGB range: %d/%d\n", tpg->rgb_range, tpg->real_rgb_range); |