From patchwork Thu Jun 14 07:11:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 11708 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Sf4DE-000691-1O for patchwork@linuxtv.org; Thu, 14 Jun 2012 09:11:24 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1Sf4DD-0004Hy-He; Thu, 14 Jun 2012 09:11:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809Ab2FNHLU (ORCPT ); Thu, 14 Jun 2012 03:11:20 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:10432 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751927Ab2FNHLT (ORCPT ); Thu, 14 Jun 2012 03:11:19 -0400 Received: from euspt2 (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M5L009T1INP0G90@mailout1.w1.samsung.com> for linux-media@vger.kernel.org; Thu, 14 Jun 2012 08:11:49 +0100 (BST) Received: from linux.samsung.com ([106.116.38.10]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M5L00EK0IMQDX@spt2.w1.samsung.com> for linux-media@vger.kernel.org; Thu, 14 Jun 2012 08:11:15 +0100 (BST) Received: from localhost.localdomain (unknown [106.116.48.198]) by linux.samsung.com (Postfix) with ESMTP id 4D68627014D; Thu, 14 Jun 2012 09:15:39 +0200 (CEST) Date: Thu, 14 Jun 2012 09:11:01 +0200 From: Andrzej Hajda Subject: [PATCH] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT To: linux-media@vger.kernel.org Cc: Hans Verkuil , Marek Szyprowski , Kamil Debski , Andrzej Hajda , Kyungmin Park Message-id: <1339657861-22160-1-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.7.0.4 Content-transfer-encoding: 7BIT X-TM-AS-MML: No Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.6.14.65723 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' HTML_NO_HTTP 0.1, MULTIPLE_RCPTS 0.1, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CTE 0, __HAS_HTML 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Image size for MFC encoder should have size between 8x4 and 1920x1080 with even width and height. Signed-off-by: Andrzej Hajda Signed-off-by: Kyungmin Park Acked-by: Kamil Debski --- drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index 9c19aa8..03d8334 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c @@ -901,6 +901,8 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f) mfc_err("failed to try output format\n"); return -EINVAL; } + v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1, + &pix_fmt_mp->height, 4, 1080, 1, 0); } else { mfc_err("invalid buf type\n"); return -EINVAL;