From patchwork Mon Nov 25 09:58:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 3229031 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA6699F461 for ; Mon, 25 Nov 2013 09:59:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFAA020216 for ; Mon, 25 Nov 2013 09:59:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 462A3201BE for ; Mon, 25 Nov 2013 09:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752190Ab3KYJ7P (ORCPT ); Mon, 25 Nov 2013 04:59:15 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:39697 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752180Ab3KYJ7O (ORCPT ); Mon, 25 Nov 2013 04:59:14 -0500 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MWT003KHD2P7K40@mailout3.samsung.com> for linux-media@vger.kernel.org; Mon, 25 Nov 2013 18:59:13 +0900 (KST) X-AuditID: cbfee61a-b7f316d000007e34-d3-52931f710e63 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 9B.24.32308.17F13925; Mon, 25 Nov 2013 18:59:13 +0900 (KST) Received: from AMDC2362.DIGITAL.local ([106.120.53.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MWT004BMD1ERF40@mmp2.samsung.com>; Mon, 25 Nov 2013 18:59:12 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: sw0312.kim@samsung.com, andrzej.p@samsung.com, s.nawrocki@samsung.com, Jacek Anaszewski , Kyungmin Park Subject: [PATCH v2 13/16] s5p-jpeg: Allow for wider JPEG subsampling scope for Exynos4x12 encoder Date: Mon, 25 Nov 2013 10:58:20 +0100 Message-id: <1385373503-1657-14-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1385373503-1657-1-git-send-email-j.anaszewski@samsung.com> References: <1385373503-1657-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPJMWRmVeSWpSXmKPExsVy+t9jQd1C+clBBtOPclnMetnOYtF79Tmj xdmmN+wWPRu2slocftPOajFj8ks2BzaPvi2rGD0+b5ILYIrisklJzcksSy3St0vgyljS9pm5 4C17ReOyfvYGxutsXYycHBICJhK7H91mhbDFJC7cWw8U5+IQEpjOKLG75y8zhNPOJDHnwQQm kCo2AUOJny9eg9kiAvIST3pvgHUwCyxllLg46Qg7SEJYIFli9oaVYGNZBFQlWr40g8V5BTwk Xs14ChTnAFqnIDFnkg2IyQkUnj8JrFpIwF1iyY+N7BMYeRcwMqxiFE0tSC4oTkrPNdQrTswt Ls1L10vOz93ECA6WZ1I7GFc2WBxiFOBgVOLhtaicFCTEmlhWXJl7iFGCg1lJhPe05OQgId6U xMqq1KL8+KLSnNTiQ4zSHCxK4rwHWq0DhQTSE0tSs1NTC1KLYLJMHJxSDYyrpb4yLU/0dl5b ey/9s4ZlhxZPcqH/6mrTjYnvuCZ+nDRVX07nNfv1w05nE0vY7Fl3lgfMmn1yhozy1sAORa8r JdFvpTVSpN2tmDSuLlHz02tp23Pifzf33ymyG2U9d95JOna1J4P52b5rt6t3Po1WnjPFqS35 7G2VR0/u6h+5p3si7hOboKESS3FGoqEWc1FxIgCRJIYhEgIAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Exynos4x12 supports wider scope of subsampling modes than S5PC210. Adjust corresponding mask accordingly. Signed-off-by: Jacek Anaszewski Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-jpeg/jpeg-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c index 76d8c12..e85ac6a 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1246,7 +1246,8 @@ static int s5p_jpeg_controls_create(struct s5p_jpeg_ctx *ctx) v4l2_ctrl_new_std(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops, V4L2_CID_JPEG_RESTART_INTERVAL, 0, 3, 0xffff, 0); - mask = ~0x06; /* 422, 420 */ + if (ctx->jpeg->variant->version == SJPEG_S5P) + mask = ~0x06; /* 422, 420 */ } ctrl = v4l2_ctrl_new_std_menu(&ctx->ctrl_handler, &s5p_jpeg_ctrl_ops,