From patchwork Sun Jul 5 12:11:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 234827 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3932620ilg; Sun, 5 Jul 2020 05:12:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFWqPsKRP2DvrTAg2Ago3s/aqoodzCiVYqyEpSW25kwr1w6vUlo2Hd6r4Tw7b2qxFR7MoM X-Received: by 2002:a17:906:8316:: with SMTP id j22mr38505153ejx.97.1593951131800; Sun, 05 Jul 2020 05:12:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593951131; cv=none; d=google.com; s=arc-20160816; b=Ir/PpllEIdtYE60zeCJOV0uNLGtR69lyeEXA/DGI1Uz6CAxBIvO2UtpGWRW8Y6rJPY KLqLKRe8GpKKSoeIhnBkERBElY9Zx8x812uMG2CuDWsZXe2VLk79aXm1Igd7VlHa8Rvw 6gLa1swjWx1jxpLcP45dCy6njFYWyj/WVza1qt8tASivs5j8+sZh89K0ZESEm5q5rc64 aUJgJNJBQPAIhPHBpWertsQ1HZ+O41vT10+j2JVezYmx+cTc9GRmOrpLbM0NUfoZHD78 6CTt9UhRakLjBP0qwVn8+1UUDyvt0HLd3huQs9bVsJMGR0tRDceCxwbkmKQxACxcdLtu 667w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=PCNLmGR8sMtBYV74iVoiny++gKyFU6QKve9J6ft8KaU=; b=NJ+XYqh2l2schzl/zzkZAkTfEjZ6Hpsmz1VwghdvMRe1RmwH3iACwTu6GdMDeGAc4f /sEqblyfTEUgkwwbYAlV8MjTYsK+UMeV2rLXqmvTyjjUn96a/2IsGZA/DxFp1PzLr8s5 d0ccZBVtob27PYFBUaeGcbByBwtQtkG5GcX3CMSTIIK+U8Thr4wBlhzHaC7iwZFRzNRv 5MXvUimwb4j224mkk4kgLr59tFWmCtlTp51e1P6DZO71qzEdnMG5eKWMx1MBQQfK2XF5 MDO/I508g3B5njEayiKkdukDepKPi4DTPs1B9oc9Cj8tqyiLK/OSXVwamqR86sGR2SJ/ E6Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="K/7rA4K4"; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r22si11728725edq.411.2020.07.05.05.12.11; Sun, 05 Jul 2020 05:12:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="K/7rA4K4"; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727062AbgGEMMJ (ORCPT + 4 others); Sun, 5 Jul 2020 08:12:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727052AbgGEMMJ (ORCPT ); Sun, 5 Jul 2020 08:12:09 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C891CC08C5DF for ; Sun, 5 Jul 2020 05:12:08 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id by13so22272376edb.11 for ; Sun, 05 Jul 2020 05:12:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PCNLmGR8sMtBYV74iVoiny++gKyFU6QKve9J6ft8KaU=; b=K/7rA4K4EI8hH3WgLD9Nf1fvOjaQ2N3MAe9A9/Q+DJx/2ssL1Qe4HiABlOUCSkqgWw JAlYHMnQbaZkFA1GCxToq1heUQvMw4zBb1asjEsuCMT7CyN/hpN4eFNbkGR3uMO6NVyV KmSWfYWLxCVEipYByTksOCBLMyMtwvaLO1xmibJFqSdDo45h5/2bNFh7mE8epKXLn5M1 UX7W4uTFx38idvXGt1L1olIZTTv3YXLtyeqTNxrJ8rbQseZwicHF6JvvrMkldIazkioa +UObmDI13lhx1SB+NXQBsWu/Qh7Wqe2DblVQ2aOiUw5R3qu1kb/QSyoQMo42cXONv2Oz A1yw== 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:in-reply-to :references; bh=PCNLmGR8sMtBYV74iVoiny++gKyFU6QKve9J6ft8KaU=; b=rZJbT5d6mh+1Bm66hyndTZYK7uJ3nVJZYQXyBGsl0nfhH34VXhWex0W1Bzab41i8/R cGXJb4f1nKLoLlJe3uS3XsW9pM1otm5xj1X8dgzplhLuj9kTPr92xkSfbbQuVNy+uMMi JwOoOB55BH1uUWEZJ2PPQHVzl6Q+3zQkadOr2n6BIxKRAwd5RjF+aeZfJX/6c9SERhF9 HidXUeWV3OaupIrLUZvBnyhrVgsDHdXgD3fDhIeHpjVONHbzfKInpOBzlFPtVrSheseO YnWL2LiV3G5ZJXh0LWTt/+nkzUoCvWzASkdnItl/WOBcoBVbp4eecy3Eu2/liymCKOko n8MA== X-Gm-Message-State: AOAM532Jl1MF2qF5xJfMpOVtOmxc0qwpkFMVrzgKy9PIxJivk3J2xikE FsoXeee2HRTZGsy2W9KsaFCT9H3IaibogQ== X-Received: by 2002:aa7:c2cf:: with SMTP id m15mr25321916edp.27.1593951127381; Sun, 05 Jul 2020 05:12:07 -0700 (PDT) Received: from localhost.localdomain (212-5-158-133.ip.btc-net.bg. [212.5.158.133]) by smtp.gmail.com with ESMTPSA id j64sm1517458edd.61.2020.07.05.05.12.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 05:12:06 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Kyungmin Park , Kamil Debski , Jeongtae Park , Andrzej Hajda , Hans Verkuil , Maheshwar Ajja , Stanimir Varbanov Subject: [PATCH 3/4] media: s5p-mfc: Use standard frame skip mode control Date: Sun, 5 Jul 2020 15:11:27 +0300 Message-Id: <20200705121128.5250-4-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200705121128.5250-1-stanimir.varbanov@linaro.org> References: <20200705121128.5250-1-stanimir.varbanov@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Use the standard menu control for frame skip mode in the MFC driver. The legacy private menu control is kept for backward compatibility. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.17.1 diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 912fe0c5ab18..3092eb6777a5 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -261,6 +261,11 @@ static struct mfc_control controls[] = { .menu_skip_mask = 0, .default_value = V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED, }, + { + .id = V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE, + .maximum = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT, + .default_value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, + }, { .id = V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT, .type = V4L2_CTRL_TYPE_BOOLEAN, @@ -1849,6 +1854,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) p->seq_hdr_mode = ctrl->val; break; case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE: + case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE: p->frame_skip_mode = ctrl->val; break; case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT: