From patchwork Thu Apr 15 22:42:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sensoray-dev X-Patchwork-Id: 92998 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3FMnbRB006035 for ; Thu, 15 Apr 2010 22:49:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757862Ab0DOWtb (ORCPT ); Thu, 15 Apr 2010 18:49:31 -0400 Received: from gateway03.websitewelcome.com ([69.93.223.26]:44381 "HELO gateway03.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757064Ab0DOWtb (ORCPT ); Thu, 15 Apr 2010 18:49:31 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Apr 2010 22:49:37 +0000 (UTC) X-Greylist: delayed 396 seconds by postgrey-1.27 at vger.kernel.org; Thu, 15 Apr 2010 18:49:31 EDT Received: (qmail 2221 invoked from network); 15 Apr 2010 22:44:41 -0000 Received: from gator886.hostgator.com (174.120.40.226) by gateway03.websitewelcome.com with SMTP; 15 Apr 2010 22:44:41 -0000 Received: from [66.15.212.169] (port=20265 helo=user-desktop.local) by gator886.hostgator.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1O2Xlt-0006s4-Fe; Thu, 15 Apr 2010 17:42:53 -0500 Date: Thu, 15 Apr 2010 15:42:47 -0700 (PDT) From: sensoray-dev Subject: s2255drv: V4L2_MODE_HIGHQUALITY correction To: linux-media@vger.kernel.org Message-ID: MIME-Version: 1.0 Content-Disposition: INLINE X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator886.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - sensoray.com Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff -r bffdebcb994c -r f12b3074bb02 linux/drivers/media/video/s2255drv.c --- a/linux/drivers/media/video/s2255drv.c Thu Apr 15 08:48:31 2010 -0700 +++ b/linux/drivers/media/video/s2255drv.c Thu Apr 15 15:40:56 2010 -0700 @@ -23,8 +23,6 @@ * * -full size, color mode YUYV or YUV422P 1/2 frame rate: all 4 channels * at once. - * (TODO: Incorporate videodev2 frame rate(FR) enumeration, - * which is currently experimental.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -127,7 +125,7 @@ #define MASK_COLOR 0x000000ff #define MASK_JPG_QUALITY 0x0000ff00 #define MASK_INPUT_TYPE 0x000f0000 -/* frame decimation. Not implemented by V4L yet(experimental in V4L) */ +/* frame decimation. */ #define FDEC_1 1 /* capture every frame. default */ #define FDEC_2 2 /* capture every 2nd frame */ #define FDEC_3 3 /* capture every 3rd frame */ @@ -1662,6 +1660,7 @@ } mode.fdec = fdec; sp->parm.capture.timeperframe.denominator = def_dem; + stream->cap_parm = sp->parm.capture; s2255_set_mode(channel, &mode); dprintk(4, "%s capture mode, %d timeperframe %d/%d, fdec %d\n", __func__,