From patchwork Wed Jun 15 10:15:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Pantelic X-Patchwork-Id: 881562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5FAG537024538 for ; Wed, 15 Jun 2011 10:16:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754564Ab1FOKQD (ORCPT ); Wed, 15 Jun 2011 06:16:03 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:41392 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753960Ab1FOKQC (ORCPT ); Wed, 15 Jun 2011 06:16:02 -0400 Received: by fxm17 with SMTP id 17so276062fxm.19 for ; Wed, 15 Jun 2011 03:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type; bh=a0l4+RzqA1xRFRR8vxtvc171Ai5yS+7dagjizY+rJIU=; b=f/YnM0NtQzcMTwm9coOqruj2dk6MROIozMD0ik9vFoPPdZUiOwAaYU+L5uBGoVWZ0o Wrbp2ZcbeCfrz0bwg+gx3fWZ7WrgvBj8A6zmhiWxA+8L7wTNVCkZUlkaP2G27IjQ7Vkp X+zShYLoXvcCDvUeUFoidTgpnSOd96XP82BZY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type; b=KRyzS3ceaz2TVfJw/lDSvXclxTyeBurbCl1GXmIwxRmstTLxqPc3tPuPYAXmbp83r5 V0olgpPh6ceo28bLscN4+Znx58xjdBKHEmj/proz48s1cFBH8H0thNbAqQnp9hYsuwGo CPmdBazQ9bxxnXHPt2kyAwlRCKWeb7Oyo47gI= Received: by 10.223.127.197 with SMTP id h5mr381280fas.36.1308132961153; Wed, 15 Jun 2011 03:16:01 -0700 (PDT) Received: from [192.168.1.22] (p50996ded.dip0.t-ipconnect.de [80.153.109.237]) by mx.google.com with ESMTPS id l26sm134057fah.38.2011.06.15.03.15.59 (version=SSLv3 cipher=OTHER); Wed, 15 Jun 2011 03:16:00 -0700 (PDT) Message-ID: <4DF8865F.5010007@gmail.com> Date: Wed, 15 Jun 2011 12:15:59 +0200 From: Vladimir Pantelic User-Agent: Mozilla/5.0 (X11; Linux i686; rv:2.0.1) Gecko/20110511 Firefox/4.0.1 SeaMonkey/2.1 MIME-Version: 1.0 To: Kernel development list CC: linux-omap@vger.kernel.org, "Hiremath, Vaibhav" Subject: Re: [PATCH] omap v4l2: fix wrong resizer calculation References: <4DB67614.7030008@gmail.com> In-Reply-To: <4DB67614.7030008@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 15 Jun 2011 10:16:05 +0000 (UTC) ping From 47473f26bda2ef2e3a5e8f0203fde0c74c412c36 Mon Sep 17 00:00:00 2001 From: Vladimir Pantelic Date: Tue, 26 Apr 2011 09:28:11 +0200 Subject: [PATCH] omap v4l2: fix wrong resizer calculation in omap_vout_new_crop(), "crop" is the output parameter and therefore new_crop/try_crop should be used to calculate the resizer values Signed-off-by: Vladimir Pantelic --- drivers/media/video/omap/omap_voutlib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/omap/omap_voutlib.c b/drivers/media/video/omap/omap_voutlib.c index 2aa6a76..8ae7481 100644 --- a/drivers/media/video/omap/omap_voutlib.c +++ b/drivers/media/video/omap/omap_voutlib.c @@ -193,7 +193,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix, return -EINVAL; if (cpu_is_omap24xx()) { - if (crop->height != win->w.height) { + if (try_crop.height != win->w.height) { /* If we're resizing vertically, we can't support a * crop width wider than 768 pixels. */ @@ -202,7 +202,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix, } } /* vertical resizing */ - vresize = (1024 * crop->height) / win->w.height; + vresize = (1024 * try_crop.height) / win->w.height; if (cpu_is_omap24xx() && (vresize > 2048)) vresize = 2048; else if (cpu_is_omap34xx() && (vresize > 4096)) @@ -221,7 +221,7 @@ int omap_vout_new_crop(struct v4l2_pix_format *pix, try_crop.height = 2; } /* horizontal resizing */ - hresize = (1024 * crop->width) / win->w.width; + hresize = (1024 * try_crop.width) / win->w.width; if (cpu_is_omap24xx() && (hresize > 2048)) hresize = 2048; else if (cpu_is_omap34xx() && (hresize > 4096)) -- 1.6.0.2