From patchwork Tue Jun 16 20:14:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 188106 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3965196ilo; Tue, 16 Jun 2020 13:15:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtNJ1s71Nz2j+cxILwIJrNBrdUzI8sKRtN0Ya4lkIy7ZKEJiIxWeRD+cspffLxJjwef+vU X-Received: by 2002:a17:906:4e88:: with SMTP id v8mr4613652eju.360.1592338556754; Tue, 16 Jun 2020 13:15:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592338556; cv=none; d=google.com; s=arc-20160816; b=o2VWjAFKPQLY00ioR121gyNXXywpakjI88Qiw/XWp8g0NgpqQnGB+WoXTTrV5fEKb3 oy+uKqZTc6acon30InfMp/tpTDEXZ11WelDHSVgPlr6GZzJbtgMCm1NUv2UrzXbgpxpC Yd+60h0ebvPg4TiCYoUIr4tvpJHBZHEjZ2nep0qOen5vYJOaZLe65xiSgWj4Bmg3942l 1wIPmNKKzuktvHqOKfwIGaGwRHQZ2Z/4QS41iLMYTBEG6vnALrH7HRURbOUi2+4/LXds +VpaznI270fNzGJW0myheeSn6drVH6eBb3vbl2l97s1zbteRzflf4ISdTHE3zT7Fushd MUOg== 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=AZqdoAEGz2z2dhDjwXWaMZ24wdl6oc5L+Rca1tEh8dc=; b=tpCjYRWX/IjGdvdfBacM6H/7rHfG50WTdkS1tt2MLre9uNNQhP1BtkGVso4XrNPAV1 879HjVxchwI8+ZiVO616rCVmoHOF0wtuH3/Ed2zLj753Xbp6iJkyK/l9FyLEmSRojQb6 nhbYEN6md0KRwBriKqgDuuNZFPdtPAj08JEn32JudaUdITrQTDmbBXZnHGTR1nGtWcXs GDetYvK4D6SDg5r4KtaBbeBk+7abT0dhrGlcomkjxUDq9rpLFNFkId1/AfijVIjY7lSn pyPEYe1WNVZ8D9IfgmVb7PpEiI9FNMVasp9KU1yKfDWUE9mhxovYSbAtaY4rZGBPbelM lShg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gy3NOO0T; 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 h21si11294464edv.274.2020.06.16.13.15.56; Tue, 16 Jun 2020 13:15:56 -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=gy3NOO0T; 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 S1731715AbgFPUPw (ORCPT + 4 others); Tue, 16 Jun 2020 16:15:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731682AbgFPUPp (ORCPT ); Tue, 16 Jun 2020 16:15:45 -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 BDA10C061573 for ; Tue, 16 Jun 2020 13:15:43 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id o26so181960edq.0 for ; Tue, 16 Jun 2020 13:15:43 -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=AZqdoAEGz2z2dhDjwXWaMZ24wdl6oc5L+Rca1tEh8dc=; b=gy3NOO0TVFbQO8JeVz50/yi9A6AS7UoNAvAWS0yUYYqBasL4KYmzd6LX0YSCcoYzih WZAXIMLWxXdlpY/bvSoQGSycZqpuRHWIneQo9OcdzFjNUomCLSSqIOPp+mszgZqoPk58 11vlXMHdE8MlJ4HgS2M268UOIQg/vg94l2gEPrHYgzwAlfNPcT+aLo+uzZqgkLwSOejQ 7pTvUWtbeRhK8owv8gttck7ySAvgy2te3vvK1RRACY0AitSSke1l+HqJN1XmObrNj9pk 9Gt8EA3JTwxuKVwPRdbirVeQDhKiVXmFX2yjEqB5roJ5YX8jD5XeOYouqsyg4Mbq/taa zXVQ== 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=AZqdoAEGz2z2dhDjwXWaMZ24wdl6oc5L+Rca1tEh8dc=; b=Q/csQD8cFT9VdziULGw04gygDODip+ZQS9TUJKZEYa5y57tvWlPNHvXZa3hfwgm2EZ FndOTZTeu5kRv6rNaPVO1LFi0TS3FpS86/JHNg7WOOkKUzkvLo4KR5ZdEFEXsfgWtOAG rQ9RlMcH5a+q9b5YJfm8D9dBGs7RJXRR/AfyhfVGEl4JvQEZ9XK93C5Sf57AWKABprWM Wf68aVUIBo0hGjtsxLDZmZGNBufgZEEoxLm7kZDAxkGQ1ipEnHXTVkBltmPWRMJgpIPJ y5QRJpNzjeLx43TStN1V+ZdgWWXsaKQo8ijyVwsAJ5Y+8Sfo3sqDvay7DorU8aD01G7+ Z9Uw== X-Gm-Message-State: AOAM533eRlNK+RCVzc8iHwna9XTg9ajAfWJmQ1khU4DQCDjIPpBYgFHw 8hdtj3jeUTfOFU2AEj27NhmodgGsMQxQpw== X-Received: by 2002:aa7:da8c:: with SMTP id q12mr4234503eds.385.1592338542217; Tue, 16 Jun 2020 13:15:42 -0700 (PDT) Received: from localhost.localdomain (212-5-158-38.ip.btc-net.bg. [212.5.158.38]) by smtp.gmail.com with ESMTPSA id b14sm11602658ejq.105.2020.06.16.13.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 13:15:41 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Hans Verkuil , Ezequiel Garcia , Maheshwar Ajja , Mauro Carvalho Chehab , Stanimir Varbanov Subject: [PATCH v2 4/4] venus: vdec: Add support for decode intra frames only Date: Tue, 16 Jun 2020 23:14:46 +0300 Message-Id: <20200616201446.15996-5-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200616201446.15996-1-stanimir.varbanov@linaro.org> References: <20200616201446.15996-1-stanimir.varbanov@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Adds support in the decoder for intra frames only decode. The implementation in the Venus use HFI property for thumbnail generation to lower memory usage and when the control is enabled the number of decoder output buffers for progressive stream will be one (for interlace two). We assume that the client will queue on the decoder input intra frames only but this is not mandatory. If the client queue non-intra frames on decoder input they will be returned on decoder output with an error. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 7 +++++++ drivers/media/platform/qcom/venus/vdec_ctrls.c | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 1bac30d4cf50..b9a3b9ca6ae1 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -191,6 +191,7 @@ struct vdec_controls { u32 post_loop_deb_mode; u32 profile; u32 level; + bool intra_only; }; struct venc_controls { diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 7c4c483d5438..aa68cefcae96 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -625,6 +625,13 @@ static int vdec_set_properties(struct venus_inst *inst) return ret; } + if (ctr->intra_only) { + ptype = HFI_PROPERTY_PARAM_VDEC_THUMBNAIL_MODE; + ret = hfi_session_set_property(inst, ptype, &en); + if (ret) + return ret; + } + return 0; } diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c index 3a963cbd342a..96ca8d9dd22e 100644 --- a/drivers/media/platform/qcom/venus/vdec_ctrls.c +++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c @@ -28,6 +28,9 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: ctr->level = ctrl->val; break; + case V4L2_CID_MPEG_VIDEO_DECODE_INTRA_FRAMES_ONLY: + ctr->intra_only = ctrl->val; + break; default: return -EINVAL; } @@ -86,7 +89,7 @@ int vdec_ctrl_init(struct venus_inst *inst) struct v4l2_ctrl *ctrl; int ret; - ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 7); + ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 8); if (ret) return ret; @@ -141,6 +144,10 @@ int vdec_ctrl_init(struct venus_inst *inst) if (ctrl) ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_DECODE_INTRA_FRAMES_ONLY, + 0, 1, 1, 0); + ret = inst->ctrl_handler.error; if (ret) { v4l2_ctrl_handler_free(&inst->ctrl_handler);