From patchwork Mon Jun 12 16:27:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 103658 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp77768obh; Mon, 12 Jun 2017 09:31:42 -0700 (PDT) X-Received: by 10.99.66.5 with SMTP id p5mr58141036pga.107.1497285102004; Mon, 12 Jun 2017 09:31:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497285101; cv=none; d=google.com; s=arc-20160816; b=dw0eBPnkZy+vYHUtBUjezjOMoFnjrrmF4nqTt2H4tKPVVUXKzi8tMcJ1/2MyPUzb4V atv/D9YlwYyGD95yHGr5ZNJUM9Qosrk7U8t+EJbV6JyfzL7MljmEeaYE924ZYxFrTzlm oeNZ4jItiTfWFLDLd3w2GJs8Miu5wHM8M+/Wo+27CFm690wBS7+zv4R6t8mXDl4onAHg XM7OxIzepNcpaJ/qJxwEBjVfZmhHiMpA0lHAjUYyCg8cv6Qzj2Cl4mrp3Wu30kPVamKe vo+8ZXyRcHZ6BUI88ZUqunf61DgyGAQFw2RzTIKzj+HlUYmO35aoR7UuiH7v4e2Xtva4 Hjaw== 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:arc-authentication-results; bh=xGjG4s7f9q81WO34hY9cUv5xD2E6LJWqeseOjZYopZU=; b=nvi8G16zOVtMbRr+49lc2cD7rrvjIZN9EAVwq5kF20w14CtMMBByZ8hPMzjdDMUeoW RfMqSKp6qfFVm5khns7y4Nu+rqHgw8YBXwSG17g5hJUkLHjs5T1Q6YcI8paa4ZM4VhiH svpslWY7Ri4Gd+2ZcHksUialNSGCgWieQDLNDqEFl5KvHOVQJ4IToMo0Ho1owdyDeLWU 1eTOj8wbm7a4whoRprOQYyEk+qaeuNxnXkubeu8Lmyr7yxPLfiI2zwaRGmifLtnAINbR ZcRp4XawhYyIxqpAMcU+ETc7YyR8Qm8LwlawY7iYORo0NHJnNaxfkqeeSUqGOHDaHeI8 rv7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id r90si7259987pfe.5.2017.06.12.09.31.41; Mon, 12 Jun 2017 09:31:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S932120AbdFLQaH (ORCPT + 25 others); Mon, 12 Jun 2017 12:30:07 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:34012 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754249AbdFLQaE (ORCPT ); Mon, 12 Jun 2017 12:30:04 -0400 Received: by mail-wr0-f177.google.com with SMTP id g76so101848090wrd.1 for ; Mon, 12 Jun 2017 09:30:03 -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=xGjG4s7f9q81WO34hY9cUv5xD2E6LJWqeseOjZYopZU=; b=eU8LkCq7jIvVpVsNEIX82HItdJO6R87qaSMGVz/P6Oi1IM4mINC9HSusNxAbRNZjFh 1eVcmzn/FUwOr48E76OTnRKHETKhxRfL9PZrhx/r+J3lQcMB0aJZmyYrYLM01sGz6RAp IR1q3ryfpU5lIlKiVNf+G5IAhqgqTwr0GaZoc= 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=xGjG4s7f9q81WO34hY9cUv5xD2E6LJWqeseOjZYopZU=; b=Z2/7jEs+hmtK4nLf2zKuhfn9ObumkeqFkZKPV5DmuXvtxp+v4QdcJ8375314BXAf00 Xv1jPRkDvIU8FnBIzG4X93cEPhPJmn8Qwmvz+f/dvKNiQtjU0Hs02DjjPOJvSCuuehp1 MkO20mexzR2GgnTq1Gk7xoGPPoaVwPRnwmE1NX6UY/5RZZc3encTRGCaZrMDPHE5uyhD i2hD83M1zYblABok4ctoKajL1n22gZNIFROdV0f8ZfhSo2AKNxjYQhR2mbrtQWjaqRF3 GmJShGHauTTEtx5HTLZNoxSRTahKLmeQHg02fumSnSORZLUXFkbbyg/cMNPVF62QB+Zz HWUQ== X-Gm-Message-State: AODbwcAvXeUyUoftujcrIwzyRqzBoL9l/euBKf9AW4KLg/QDi8+grLZw lvccYwjl9AFoarqr+/q6lg== X-Received: by 10.28.40.198 with SMTP id o189mr8517740wmo.102.1497285001066; Mon, 12 Jun 2017 09:30:01 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id 49sm14493531wrz.8.2017.06.12.09.30.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 09:30:00 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v10 17/18] media: venus: vdec: add support for min buffers for capture Date: Mon, 12 Jun 2017 19:27:54 +0300 Message-Id: <1497284875-19999-18-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497284875-19999-1-git-send-email-stanimir.varbanov@linaro.org> References: <1497284875-19999-1-git-send-email-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds support for V4L2_CID_MIN_BUFFERS_FOR_CAPTURE get control in venus decoder, it is usable in case when the userspace wants to know minimum capture buffers before calling request_buf for capture queue in mem2mem drivers. Also this will fix an issue found gstreamer v4l2videodec element, i.e. the video decoder element cannot continue because the buffers are insufficient. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/vdec.c | 7 +++++++ drivers/media/platform/qcom/venus/vdec_ctrls.c | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 594315b55b1f..eb0c1c51cfef 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -627,6 +627,12 @@ static int vdec_queue_setup(struct vb2_queue *q, inst->out_height); inst->input_buf_size = sizes[0]; inst->num_input_bufs = *num_buffers; + + ret = vdec_cap_num_buffers(inst, &num); + if (ret) + break; + + inst->num_output_bufs = num; break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: *num_planes = inst->fmt_cap->num_planes; @@ -951,6 +957,7 @@ static int vdec_open(struct file *file) inst->core = core; inst->session_type = VIDC_SESSION_TYPE_DEC; + inst->num_output_bufs = 1; venus_helper_init_instance(inst); diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c index 1045fc5b4925..032839bbc967 100644 --- a/drivers/media/platform/qcom/venus/vdec_ctrls.c +++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c @@ -70,6 +70,9 @@ static int vdec_op_g_volatile_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER: ctrl->val = ctr->post_loop_deb_mode; break; + case V4L2_CID_MIN_BUFFERS_FOR_CAPTURE: + ctrl->val = inst->num_output_bufs; + break; default: return -EINVAL; }; @@ -87,7 +90,7 @@ int vdec_ctrl_init(struct venus_inst *inst) struct v4l2_ctrl *ctrl; int ret; - ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 6); + ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 7); if (ret) return ret; @@ -135,6 +138,11 @@ int vdec_ctrl_init(struct venus_inst *inst) v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER, 0, 1, 1, 0); + ctrl = v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 32, 1, 1); + if (ctrl) + ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + ret = inst->ctrl_handler.error; if (ret) { v4l2_ctrl_handler_free(&inst->ctrl_handler);