From patchwork Tue Dec 27 19:43:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 9128 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RfcwQ-0003YE-Rl; Tue, 27 Dec 2011 20:44:48 +0100 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 id 1RfcwQ-0002cN-GR; Tue, 27 Dec 2011 20:44:06 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753010Ab1L0ToA (ORCPT + 3 others); Tue, 27 Dec 2011 14:44:00 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:42288 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856Ab1L0Tn5 (ORCPT ); Tue, 27 Dec 2011 14:43:57 -0500 Received: by mail-ee0-f46.google.com with SMTP id c4so11868452eek.19 for ; Tue, 27 Dec 2011 11:43:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=EKRHBOGKntCsdVUQOCiM/NFltNUR5zw/Ct+OKOxFNLw=; b=aZq3hDo1Rn5qiDObsxu9q2CIwZcsT5VwlZdBCr87OjzrjIo28y3qsXeWKya9OaUONh 9mK2dMyPiNTrfPVdjTsnVzTKWaO/IbFzd5Jo9xm4io5OTz7mryL6Z434ndHpGx9TpTY2 CEjm4Zzvj5WhOflXd2tSjlesrt7Nx8PhbZdRQ= Received: by 10.213.36.20 with SMTP id r20mr3575318ebd.133.1325015036121; Tue, 27 Dec 2011 11:43:56 -0800 (PST) Received: from localhost.localdomain (84-dzi-26.acn.waw.pl. [85.222.29.84]) by mx.google.com with ESMTPS id y12sm109479410eeb.11.2011.12.27.11.43.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 27 Dec 2011 11:43:55 -0800 (PST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: Jean-Francois Moine , Mauro Carvalho Chehab , Hans Verkuil , Luca Risolia , Hans de Goede , Sylwester Nawrocki Subject: [PATCH 3/4] gspca: sonixj: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support Date: Tue, 27 Dec 2011 20:43:30 +0100 Message-Id: <1325015011-11904-4-git-send-email-snjw23@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1325015011-11904-1-git-send-email-snjw23@gmail.com> References: <4EBECD11.8090709@gmail.com> <1325015011-11904-1-git-send-email-snjw23@gmail.com> 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: 2011.12.27.193617 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' X-LSpam-Score: -1.9 (-) X-LSpam-Report: No, score=-1.9 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, T_DKIM_INVALID=0.01 autolearn=ham The JPEG compression quality value can currently be read using the VIDIOC_G_JPEGCOMP ioctl. As the quality field of struct v4l2_jpgecomp is being deprecated, we add the V4L2_CID_JPEG_COMPRESSION_QUALITY control, so after the deprecation period VIDIOC_G_JPEGCOMP ioctl handler can be removed, leaving the control the only user interface for retrieving the compression quality. For completeness the V4L2_CID_JPEG_ACTIVE_MARKER control should be also added. Cc: Jean-Francois Moine Signed-off-by: Sylwester Nawrocki --- drivers/media/video/gspca/sonixj.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index c55d667..c148081 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c @@ -45,6 +45,7 @@ enum e_ctrl { SHARPNESS, ILLUM, FREQ, + QUALITY, NCTRLS /* number of controls */ }; @@ -126,6 +127,7 @@ static void qual_upd(struct work_struct *work); #define DEF_EN 0x80 /* defect pixel by 0: soft, 1: hard */ /* V4L2 controls supported by the driver */ +static int getjpegqual(struct gspca_dev *gspca_dev, s32 *val); static void setbrightness(struct gspca_dev *gspca_dev); static void setcontrast(struct gspca_dev *gspca_dev); static void setcolors(struct gspca_dev *gspca_dev); @@ -286,6 +288,19 @@ static const struct ctrl sd_ctrls[NCTRLS] = { }, .set_control = setfreq }, +[QUALITY] = { + { + .id = V4L2_CID_JPEG_COMPRESSION_QUALITY, + .type = V4L2_CTRL_TYPE_INTEGER, + .name = "Compression Quality", + .minimum = QUALITY_MIN, + .maximum = QUALITY_MAX, + .step = 1, + .default_value = QUALITY_DEF, + .flags = V4L2_CTRL_FLAG_READ_ONLY, + }, + .get = getjpegqual + }, }; /* table of the disabled controls */ @@ -2960,6 +2975,14 @@ static int sd_get_jcomp(struct gspca_dev *gspca_dev, return 0; } +static int getjpegqual(struct gspca_dev *gspca_dev, s32 *val) +{ + struct sd *sd = (struct sd *) gspca_dev; + + *val = sd->quality; + return 0; +} + static int sd_querymenu(struct gspca_dev *gspca_dev, struct v4l2_querymenu *menu) {