From patchwork Wed Oct 3 07:06:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keiichi Watanabe X-Patchwork-Id: 10624327 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 C1A3E13BB for ; Wed, 3 Oct 2018 07:07:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0C5D2860A for ; Wed, 3 Oct 2018 07:07:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4A9A28675; Wed, 3 Oct 2018 07:07:11 +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 4B57A2860A for ; Wed, 3 Oct 2018 07:07:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727201AbeJCNyM (ORCPT ); Wed, 3 Oct 2018 09:54:12 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39714 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726943AbeJCNyL (ORCPT ); Wed, 3 Oct 2018 09:54:11 -0400 Received: by mail-pg1-f195.google.com with SMTP id r9-v6so1125027pgv.6 for ; Wed, 03 Oct 2018 00:07:07 -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=L4Qc0CALP1RkFVbalnzq2/EzAfTuUelm706tDhlpe7o=; b=QVa16tsqX6UunwOzQdSAithVgVfbGsz57QzaFQ/qao8UWNctYlvni8jGH1WzAsCFJZ q4tdKwuXcd+Ye+A3w6AtpEJV7KclhvH1C5JWeso8ytdjOmQREfSUIq6CYsA5TpJ0cM93 aHlufnqpnrz470xdSaW4OVG3WIZF2Hyke8bBU= 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=L4Qc0CALP1RkFVbalnzq2/EzAfTuUelm706tDhlpe7o=; b=lZ7O1VEN7YfelYal3riYuYIpjlXKqhYx0UlawKW1L/uf6B/w0w5N93UaVGuRvIoUqB E+eXxx3TxiTvZccCt8XK7z0KDGDBT4L5JbxptCAxmd3ac+I0BtkIe+un6IVS2NPK4+NW 5Pk9WjAmSBy6gYgxec90KFbuXbjv5Ipx5wi30Gwgw+10ACjgvPAViRkW4qg8dLsSlEU1 7lCJrYtAwCL1Wz+rteqFaUZ5/liBSRC1QiEJGndNtsG8RSZjN85Px8UdZpyIAhGVg84n crBqY8hsFJgRfh9E8mD+3W9HJ7rPx5xh8TfUvo2S1d578a/FCZ6l/RZ/hqNBBF4WCQ8L Ubgw== X-Gm-Message-State: ABuFfohWZu8Rei7pNHUZlss1YSvINLK8pxioNWRobYzXWDCdG9Mfy8CT 67DQh4Ms/zCXT8MBp+5Jp832zfUtMXs= X-Google-Smtp-Source: ACcGV63npfxk8jti2pKZnkMyLAPmvu6v6CpVlNiXJWmio4a4SnsBtuqIsb86WlQ8b+xrwxsK0c9i6Q== X-Received: by 2002:a62:8c93:: with SMTP id m141-v6mr177186pfd.16.1538550425774; Wed, 03 Oct 2018 00:07:05 -0700 (PDT) Received: from keiichiw1.tok.corp.google.com ([2401:fa00:4:4:968c:de0d:27a3:4bef]) by smtp.gmail.com with ESMTPSA id y1-v6sm992520pfy.89.2018.10.03.00.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 00:07:04 -0700 (PDT) From: Keiichi Watanabe To: linux-media@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org, tfiga@chromium.org, jcliang@chromium.org, shik@chromium.org, keiichiw@chromium.org Subject: [PATCH] media: vivid: Support 480p for webcam capture Date: Wed, 3 Oct 2018 16:06:56 +0900 Message-Id: <20181003070656.193854-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 --- 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..da80bf4bc365 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 }, @@ -75,6 +76,8 @@ static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = { { 1, 5 }, { 1, 10 }, { 1, 15 }, + { 1, 15 }, + { 1, 25 }, { 1, 25 }, { 1, 30 }, { 1, 50 },