From patchwork Tue Jun 7 09:58:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 855582 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p579wGVM027848 for ; Tue, 7 Jun 2011 09:58:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752728Ab1FGJ6M (ORCPT ); Tue, 7 Jun 2011 05:58:12 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:63275 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752715Ab1FGJ6K (ORCPT ); Tue, 7 Jun 2011 05:58:10 -0400 Received: from axis700.grange (dslb-094-221-030-184.pools.arcor-ip.net [94.221.30.184]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0Lkzrh-1PtAqy1UXN-00b7fX; Tue, 07 Jun 2011 11:58:09 +0200 Received: by axis700.grange (Postfix, from userid 1000) id EB421189B78; Tue, 7 Jun 2011 11:58:08 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id E89B2189B77; Tue, 7 Jun 2011 11:58:08 +0200 (CEST) Date: Tue, 7 Jun 2011 11:58:08 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Robert Jarzmik Subject: [PATCH 2/3 v2] V4L: pxa-camera: try to force progressive video format In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:FzC7GJomtAEKmx8cZ8Wpn5/xtHyHKV8N+rNv1ylPCgA PTcIUrUxYm8AgSydbYEUDhdN5m9RaZbzfYltNu4/Fi00yhYYGd Vh8vwIRoSoVvG7wW+gngSeORN7N3VlfHCMZ3iswGeXfut2k7OL d17SKss1QDVnmQsfmnO6g2cmUVHWjpj015urvM2ttw2TLN3MCD 0YkDMphSa65Sab6jMhbZ8huArjsoF2s2pVmn6uaxTo= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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]); Tue, 07 Jun 2011 09:58:16 +0000 (UTC) The pxa-camera driver only supports progressive video so far. Passing down to the client the same format, as what the user has requested can result in interlaced video, even if the client supports both. This patch avoids such cases. Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/pxa_camera.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index c7f84da..88aa1ba 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c @@ -1502,7 +1502,8 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd, /* limit to sensor capabilities */ mf.width = pix->width; mf.height = pix->height; - mf.field = pix->field; + /* Only progressive video supported so far */ + mf.field = V4L2_FIELD_NONE; mf.colorspace = pix->colorspace; mf.code = xlate->code;