From patchwork Mon Feb 13 19:08:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thibault Saunier X-Patchwork-Id: 9570671 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 4785860572 for ; Mon, 13 Feb 2017 19:10:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37CB227EED for ; Mon, 13 Feb 2017 19:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B2F527F86; Mon, 13 Feb 2017 19:10:01 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82A5D27BFF for ; Mon, 13 Feb 2017 19:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=qusPGA8FElYgxcn2s9e39aFQnwVheAWzQ0vEqk1pGao=; b=sUxLI6um5J1vZOEJDzZEKdl9Ej cQcEEKv/Wupo13Ax2ygJefd2kunK5c3R1gZUpx02DjSJuJxzp5owJsHvnJkXyjLZKUhI5kwFkL2Sw 15p46/bYL5kTyLpYcmaNbz/iVaf2rlAhDaGXLxxruTNlNwiNpvda5mkuRPgp9WNDfMQJIu6auGgez 2I+EQoPLxECZ5aaox7TFjMUsNOAPYCnjzJ1iWo3NsT5KfYeJtW9FvndRWp5XLa/3mpTwLA/nKRU1d y4YSjr4XZLK8qZXUwlfZxLlNLskoh3xWScpBwHbgCHA8iBTkyN9SNb1ZSgqHA0/8DFNzloNXUlum5 eteuoTug==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cdM0Y-00023F-CY; Mon, 13 Feb 2017 19:09:54 +0000 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49] helo=osg.samsung.com) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cdM07-0001PG-3w for linux-arm-kernel@lists.infradead.org; Mon, 13 Feb 2017 19:09:35 +0000 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id 57CE1A1313; Mon, 13 Feb 2017 19:09:32 +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 lqXnAmlXDlbl; Mon, 13 Feb 2017 19:09:31 +0000 (UTC) Received: from thiblahute.sisa.samsung.com (pc-157-76-104-200.cm.vtr.net [200.104.76.157]) by osg.samsung.com (Postfix) with ESMTPSA id C11F0A0E66; Mon, 13 Feb 2017 19:09:27 +0000 (UTC) From: Thibault Saunier To: linux-kernel@vger.kernel.org Subject: [PATCH v4 3/4] [media] s5p-mfc: Set colorspace in VIDIO_{G, TRY}_FMT if DEFAULT provided Date: Mon, 13 Feb 2017 16:08:35 -0300 Message-Id: <20170213190836.26972-4-thibault.saunier@osg.samsung.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170213190836.26972-1-thibault.saunier@osg.samsung.com> References: <20170213190836.26972-1-thibault.saunier@osg.samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170213_110927_639675_1258D251 X-CRM114-Status: GOOD ( 13.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Inki Dae , Ulf Hansson , Mauro Carvalho Chehab , Thibault Saunier , Kamil Debski , Andrzej Hajda , linux-media@vger.kernel.org, Andi Shyti , Shuah Khan , Mauro Carvalho Chehab , Javier Martinez Canillas , Kyungmin Park , Kukjin Kim , Krzysztof Kozlowski , Sylwester Nawrocki , Nicolas Dufresne , Jeongtae Park , linux-samsung-soc@vger.kernel.org, Marek Szyprowski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 when userspace provided V4L2_COLORSPACE_DEFAULT. Use 576p display resolution as a threshold to set this as suggested by EIA CEA 861B. Signed-off-by: Thibault Saunier --- Changes in v4: - Set the colorspace only if the user passed V4L2_COLORSPACE_DEFAULT, in all other cases just use what userspace provided. Changes in v3: - Do not check values in the g_fmt functions as Andrzej explained in previous review - Set colorspace if user passed V4L2_COLORSPACE_DEFAULT in Changes in v2: None drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 14 ++++++++++++++ 1 file changed, 14 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..0976c3e0a5ce 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c @@ -354,6 +354,11 @@ 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->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 +383,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 +411,14 @@ 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_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;