From patchwork Thu Feb 9 19:43:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thibault Saunier X-Patchwork-Id: 9565635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 03D1060216 for ; Thu, 9 Feb 2017 22:50:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECC4028556 for ; Thu, 9 Feb 2017 22:50:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1AC82855D; Thu, 9 Feb 2017 22:50:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AEBF28556 for ; Thu, 9 Feb 2017 22:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbdBIWtY (ORCPT ); Thu, 9 Feb 2017 17:49:24 -0500 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:52017 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752070AbdBIWtV (ORCPT ); Thu, 9 Feb 2017 17:49:21 -0500 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 3FEFFA13E5; Thu, 9 Feb 2017 19:44:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osg.samsung.com Received: from osg.samsung.com ([127.0.0.1]) by localhost (s-opensource.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u2Pq52Bck3NJ; Thu, 9 Feb 2017 19:44:07 +0000 (UTC) Received: from localhost.localdomain (pc-157-76-104-200.cm.vtr.net [200.104.76.157]) by osg.samsung.com (Postfix) with ESMTPSA id 77F55A1311; Thu, 9 Feb 2017 19:44:04 +0000 (UTC) From: Thibault Saunier To: linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Andi Shyti , Shuah Khan , Inki Dae , Nicolas Dufresne , Javier Martinez Canillas , Mauro Carvalho Chehab , Marek Szyprowski , Kukjin Kim , linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki , linux-media@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, Ulf Hansson , Thibault Saunier Subject: [PATCH 3/4] [media] s5p-mfc: Set colorspace in VIDIO_{G,TRY}_FMT Date: Thu, 9 Feb 2017 16:43:13 -0300 Message-Id: <20170209194314.5908-4-thibault.saunier@osg.samsung.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170209194314.5908-1-thibault.saunier@osg.samsung.com> References: <20170209194314.5908-1-thibault.saunier@osg.samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The media documentation says that the V4L2_COLORSPACE_SMPTE170M colorspace should be used for SDTV and V4L2_COLORSPACE_REC709 for HDTV but the driver didn't set the colorimetry, also respect usespace setting. Use 576p display resolution as a threshold to set this. Signed-off-by: Thibault Saunier --- drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c index 367ef8e8dbf0..960d6c7052bd 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -354,6 +354,15 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) pix_mp->plane_fmt[0].sizeimage = ctx->luma_size; pix_mp->plane_fmt[1].bytesperline = ctx->buf_width; pix_mp->plane_fmt[1].sizeimage = ctx->chroma_size; + + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ + pix_mp->colorspace = V4L2_COLORSPACE_REC709; + else /* SD */ + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; + } } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { /* This is run on OUTPUT The buffer contains compressed image @@ -378,6 +387,7 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f) static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) { struct s5p_mfc_dev *dev = video_drvdata(file); + struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; struct s5p_mfc_fmt *fmt; mfc_debug(2, "Type is %d\n", f->type); @@ -405,6 +415,15 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) mfc_err("Unsupported format by this MFC version.\n"); return -EINVAL; } + + if (pix_mp->colorspace != V4L2_COLORSPACE_REC709 && + pix_mp->colorspace != V4L2_COLORSPACE_SMPTE170M && + pix_mp->colorspace != V4L2_COLORSPACE_DEFAULT) { + if (pix_mp->width > 720 && pix_mp->height > 576) /* HD */ + pix_mp->colorspace = V4L2_COLORSPACE_REC709; + else /* SD */ + pix_mp->colorspace = V4L2_COLORSPACE_SMPTE170M; + } } return 0;