From patchwork Tue Oct 9 13:43:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keiichi Watanabe X-Patchwork-Id: 10632611 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F367174A for ; Tue, 9 Oct 2018 13:43:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F4BA28A45 for ; Tue, 9 Oct 2018 13:43:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32DE528BA5; Tue, 9 Oct 2018 13:43:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C539628A45 for ; Tue, 9 Oct 2018 13:43:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726822AbeJIVAv (ORCPT ); Tue, 9 Oct 2018 17:00:51 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39229 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726596AbeJIVAv (ORCPT ); Tue, 9 Oct 2018 17:00:51 -0400 Received: by mail-pg1-f193.google.com with SMTP id r9-v6so838829pgv.6 for ; Tue, 09 Oct 2018 06:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v0tKwxus/drX5kV0Dku9xw8w+RqBKDes35458ovCeko=; b=GNrs8w0TnmS4AmZ9kO0oufL04s14JZVCall9swho5QWJdXZbJ/tSyCDFdkQuucu6h0 tR35EKE/9wOWbPxQlczIc7/y2QS8HUTd+u3ydSd5Rd9zso4KKv3LOVOMmiyTn+w2x11w 6Spq6jLevOTUcUHBhbcfzzT5WRa37gfa7QOi4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=v0tKwxus/drX5kV0Dku9xw8w+RqBKDes35458ovCeko=; b=k7aGX0Z7xYC+/JWpDniWHRYP8IBsz4p0Uvr8cHeL6N8i+1f7xUKtPiAA/bec0lmjge sErjIMi3zjdhvDAt3Q5esrYoH43tHl8FB01Wah35UZY+D8ULs9xovy07nlkISAJfQ3v2 I/9RY+AXy3bZNVNMDqE47oNG34qWROQmdio2DGMxLvav26HciVaW/cG5cpRSXNFIom+M ux/dZi9BjSWDV1xTtoePjQaDLVQp5ZAMBK6PxBmHMpM0mqK4N6QfHllebAURhR2vdVaH BNvemS19UfNLEDJbgzsqyuLhAOlLS4QMoYtghSLcmoqqjsqIBhm+/ranU34CUXrIYrqU J6Jg== X-Gm-Message-State: ABuFfoimoizfe1UPMYFFeIVHCypxVoZ5Hn+972E/QIhPcOiZYz8w4QKW iBepfaYw0372o9ympk2rCaNuXwlUtLc= X-Google-Smtp-Source: ACcGV62uLqMHR1tagdzZnIm92fx9JV6+OP+aW09uSrzRukfIdvbL5NkhY/zvoDKTIWPP7wqyuF259w== X-Received: by 2002:a63:b409:: with SMTP id s9-v6mr25409528pgf.437.1539092629720; Tue, 09 Oct 2018 06:43:49 -0700 (PDT) Received: from keiichiw1.tok.corp.google.com ([2401:fa00:4:4:968c:de0d:27a3:4bef]) by smtp.gmail.com with ESMTPSA id f83-v6sm29850828pfa.109.2018.10.09.06.43.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 06:43:48 -0700 (PDT) From: Keiichi Watanabe To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, kieran.bingham@ideasonboard.com, tfiga@chromium.org, jcliang@chromium.org, shik@chromium.org, Keiichi Watanabe Subject: [PATCH v2] media: vivid: Support 480p for webcam capture Date: Tue, 9 Oct 2018 22:43:39 +0900 Message-Id: <20181009134339.233238-1-keiichiw@chromium.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Support 640x480 as a frame size for video input devices of vivid. Signed-off-by: Keiichi Watanabe Acked-by: Hans Verkuil Reviewed-by: Kieran Bingham --- drivers/media/platform/vivid/vivid-vid-cap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c index 58e14dd1dcd3..6cf910a60ecf 100644 --- a/drivers/media/platform/vivid/vivid-vid-cap.c +++ b/drivers/media/platform/vivid/vivid-vid-cap.c @@ -51,7 +51,7 @@ static const struct vivid_fmt formats_ovl[] = { }; /* The number of discrete webcam framesizes */ -#define VIVID_WEBCAM_SIZES 5 +#define VIVID_WEBCAM_SIZES 6 /* The number of discrete webcam frameintervals */ #define VIVID_WEBCAM_IVALS (VIVID_WEBCAM_SIZES * 2) @@ -59,6 +59,7 @@ static const struct vivid_fmt formats_ovl[] = { static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { { 320, 180 }, { 640, 360 }, + { 640, 480 }, { 1280, 720 }, { 1920, 1080 }, { 3840, 2160 }, @@ -74,9 +75,11 @@ static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = { { 1, 4 }, { 1, 5 }, { 1, 10 }, + { 2, 25 }, { 1, 15 }, { 1, 25 }, { 1, 30 }, + { 1, 40 }, { 1, 50 }, { 1, 60 }, };