Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3733810ybt; Sun, 5 Jul 2020 05:13:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwiBmA8H8zaPpDeMIRP5yp8qfkecYwF5PcLJbIF1hFEbt5BUM3KnskPZNTqc7HxP/4bAEAy X-Received: by 2002:a50:ee84:: with SMTP id f4mr48839737edr.183.1593951220032; Sun, 05 Jul 2020 05:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593951220; cv=none; d=google.com; s=arc-20160816; b=szzgZBP+b6h2c5mptQeXW6fh01kdFXfDyeI4CzYzVWvKpBxE2fm2H3Een8DVE1yXHy qd7n+/8vmXeXUTpOFU/OL33Y8FC1PmynQUzD92V3QpXaMk0Iq6GbGjliJRGNncejk2Lx 6fjx3zTIKOz8vC6RVcjGJk35ZagkP1q4FRjSpO2hPqRfQaVuEvy65cs5MycWuaNYnt7r cmhOqV6zGt9+2vUv7X232bhwhsHcV0T5l8W4+uIPJfi4qvF5Qf5g8IDzYkLwBvQZBix6 BgLP8axGVEnLggkuos3BCcRoR8zIvjLIQxFeAqO4Ly7fRPkrAdopx7llVBuqPlp4QZqX iW5Q== 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=EqqnVBwY9QA7O8F5nMWNQtsrpyV5tcSCs4KMnME/pwJBqbG+oVUzPDzUumAG+0UCyx swHlxdKILXO1ITv/cxx71PP8yCuGxOekRNklHzZ8E+ImgfdDOIG925uGecIGY6HazQCh 0aver4KEEnkuSpODGJvLTSq6yCuZTA0Wv7uWzo7v8xg5jO3Z+RuDkmCYQnr+isAMiduv 3DNv2/HcHmZ/0XbIAR3fLi30CFRRPpnfZEL6GYAOeMzD1TpMRZF83kVNin3bsqnomK6J DWGVERd0k6ecdcwdija1z3SoJXAD/h3VdIgahCNTVogSiqNpTvPIMeaQ14brLykNWM0Q CAzA== 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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 ds2si15266864ejc.114.2020.07.05.05.13.17; Sun, 05 Jul 2020 05:13:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727078AbgGEMMQ (ORCPT + 99 others); Sun, 5 Jul 2020 08:12:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbgGEMMI (ORCPT ); Sun, 5 Jul 2020 08:12:08 -0400 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9191CC061794 for ; Sun, 5 Jul 2020 05:12:08 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id n2so23105895edr.5 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=UaOkgD+bvOw2aRxNBMnlkS6mOLXMC6P2qWaJtqTxEYi2ixJitE3CJe53WFPOnHBnNE tgiGGwfa6w7woStYHIfnvum7K+VnVMx3666TC0KH73FY90GO+CpxnbZ9w1IlCmKi41ee BjltN+CW+0ngeHIOPOQwuYkpFdOZINaOgtS5tXJAlOhXVWM36jpLGdDVz6uSlEdBPa68 aYv5XSkaTbLo9NnZ/8UXKKWq5IH9vgzohvcha7gSBbiUfo6s0kYZ+YPGt0d5iUlDpDEN S1nda7qdpwucJ+AFLIsKbsaVg+rw9TeJywzPcV/JTOVlTS8lfSS/jfwNl+hdIzlWIYtf jujQ== X-Gm-Message-State: AOAM530BX4ivwF1Pf73d4EwlkmRN9tDUSABhcKP9mVsuo1t7fTuMTdNc yaMULVy2cF8WO7zPa9gHyd9RNQ== 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(+) 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: -- 2.17.1