From patchwork Wed Dec 18 14:49:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Anaszewski X-Patchwork-Id: 3370431 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 481409F344 for ; Wed, 18 Dec 2013 14:50:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4BCB205EF for ; Wed, 18 Dec 2013 14:50:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7870B205E7 for ; Wed, 18 Dec 2013 14:50:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755040Ab3LROuI (ORCPT ); Wed, 18 Dec 2013 09:50:08 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:45810 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755021Ab3LROuG (ORCPT ); Wed, 18 Dec 2013 09:50:06 -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 <0MY0001S8BVINY70@mailout3.samsung.com> for linux-media@vger.kernel.org; Wed, 18 Dec 2013 23:50:06 +0900 (KST) X-AuditID: cbfee61a-b7f7e6d000005936-1b-52b1b61d8c01 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FE.15.22838.D16B1B25; Wed, 18 Dec 2013 23:50:06 +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 <0MY0003L3BUWKB40@mmp2.samsung.com>; Wed, 18 Dec 2013 23:50:05 +0900 (KST) From: Jacek Anaszewski To: linux-media@vger.kernel.org Cc: kyungmin.park@samsung.com, s.nawrocki@samsung.com, Jacek Anaszewski Subject: [PATCH v3 5/8] s5p-jpeg: Allow for wider JPEG subsampling scope for Exynos4x12 encoder Date: Wed, 18 Dec 2013 15:49:32 +0100 Message-id: <1387378175-23399-6-git-send-email-j.anaszewski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1387378175-23399-1-git-send-email-j.anaszewski@samsung.com> References: <1387378175-23399-1-git-send-email-j.anaszewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrCJMWRmVeSWpSXmKPExsVy+t9jQV25bRuDDH7NZ7Lovfqc0eJs0xt2 i54NW1ktDr9pZ3Vg8ejbsorR4/MmuQCmKC6blNSczLLUIn27BK6MbScOMBe8Za/4+u8BewPj dbYuRk4OCQETie5rx1ghbDGJC/fWA8W5OIQEpjNKNL87wQThtDNJ3Hl0hhmkik3AUOLni9dM ILaIgLzEk94bYJOYBVIkrv54CmYLCyRK7Li7HcxmEVCVeL/7OVAvBwevgIfE5UWxIKaEgILE nEk2IBWcAp4S7/9OYQSxhYAq/r7bwDiBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxN jOCweCa1g3Flg8UhRgEORiUeXg+vjUFCrIllxZW5hxglOJiVRHiFtgKFeFMSK6tSi/Lji0pz UosPMUpzsCiJ8x5otQ4UEkhPLEnNTk0tSC2CyTJxcEo1MEoYbzi2+9mymjmO+1gmdF4o32z7 bN3TZeoLroh4tBTK/J565P9dhQWlNyuPzXit+PnDF98Xu9/e5svmKXmhYPZwy0tns9wsB5kl qfeqvNeFNimf/n3p3C611Q+PcHtekAuKmy7qoKpZ0NrLrbUv+NKSo5rFT4VP7JP/9HfihsrY x7N3bmqc1+OnxFKckWioxVxUnAgAx4mjJgcCAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 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 377dd31..9195252 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -1249,7 +1249,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,