From patchwork Sat Sep 29 12:00:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinu Gorle X-Patchwork-Id: 10620733 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 D38006CB for ; Sat, 29 Sep 2018 12:01:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C06962A5F2 for ; Sat, 29 Sep 2018 12:01:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B40962A7E0; Sat, 29 Sep 2018 12:01:03 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 4B6D82A71B for ; Sat, 29 Sep 2018 12:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728199AbeI2S3H (ORCPT ); Sat, 29 Sep 2018 14:29:07 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:53114 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728101AbeI2S3G (ORCPT ); Sat, 29 Sep 2018 14:29:06 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 5B3A760C54; Sat, 29 Sep 2018 12:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538222454; bh=wt2Vs3KJBChGk74wCKLDNU/mV6zsInmXHS2Vli2g4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RBn+xub+ZzYePgGnuayj5HIMKpPiU3PCr6ti1R+LbEHSlSZqAjl/sYL8eDyJmq2q7 venno4v7cjpqrpYS4DB/N13/3mI2wZsEhPq28UnFyh6fV7qCShCj1qniuZLXWGOhrJ kPi4tET81d+rBRbdH6sIFrpagikgolvvGb57iG7c= Received: from sgorle-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sgorle@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4B95C602F1; Sat, 29 Sep 2018 12:00:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1538222453; bh=wt2Vs3KJBChGk74wCKLDNU/mV6zsInmXHS2Vli2g4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nd/qzE07DkKrLOFUPLhebp6p0bgsW84cEVM59EHaW0+/p1HspJ0nZEzGCb2APXiFt 7SoNRLxrRz7Wl4RvDoo7qKrR8tpfkPm2kF6s8zCRgpyjGCPU1xsdH3adAbCDmX/OZT wwzr4XQBpXMGy2L0veA4UMejKplzigFeexj4QzbM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4B95C602F1 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sgorle@codeaurora.org From: Srinu Gorle To: stanimir.varbanov@linaro.org, hverkuil@xs4all.nl, mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, sgorle@codeaurora.org Cc: acourbot@chromium.org, vgarodia@codeaurora.org Subject: [PATCH v1 2/5] media: venus: dynamically configure codec type Date: Sat, 29 Sep 2018 17:30:29 +0530 Message-Id: <1538222432-25894-3-git-send-email-sgorle@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1538222432-25894-1-git-send-email-sgorle@codeaurora.org> References: <1538222432-25894-1-git-send-email-sgorle@codeaurora.org> 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 - currently video decoder instance is hardcoded to H.264 video format. - this change enables video decoder dynamically configure to any supported video format. Signed-off-by: Srinu Gorle --- drivers/media/platform/qcom/venus/helpers.c | 51 ++++++++++++++--------------- drivers/media/platform/qcom/venus/helpers.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 2 ++ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c index 822a853..c82dbac 100644 --- a/drivers/media/platform/qcom/venus/helpers.c +++ b/drivers/media/platform/qcom/venus/helpers.c @@ -36,47 +36,44 @@ struct intbuf { unsigned long attrs; }; -bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt) +u32 v4l2_venus_fmt(u32 pixfmt) { - struct venus_core *core = inst->core; - u32 session_type = inst->session_type; - u32 codec; - - switch (v4l2_pixfmt) { + switch (pixfmt) { case V4L2_PIX_FMT_H264: - codec = HFI_VIDEO_CODEC_H264; - break; + case V4L2_PIX_FMT_H264_NO_SC: + return HFI_VIDEO_CODEC_H264; case V4L2_PIX_FMT_H263: - codec = HFI_VIDEO_CODEC_H263; - break; + return HFI_VIDEO_CODEC_H263; case V4L2_PIX_FMT_MPEG1: - codec = HFI_VIDEO_CODEC_MPEG1; - break; + return HFI_VIDEO_CODEC_MPEG1; case V4L2_PIX_FMT_MPEG2: - codec = HFI_VIDEO_CODEC_MPEG2; - break; + return HFI_VIDEO_CODEC_MPEG2; case V4L2_PIX_FMT_MPEG4: - codec = HFI_VIDEO_CODEC_MPEG4; - break; + return HFI_VIDEO_CODEC_MPEG4; case V4L2_PIX_FMT_VC1_ANNEX_G: case V4L2_PIX_FMT_VC1_ANNEX_L: - codec = HFI_VIDEO_CODEC_VC1; - break; + return HFI_VIDEO_CODEC_VC1; case V4L2_PIX_FMT_VP8: - codec = HFI_VIDEO_CODEC_VP8; - break; + return HFI_VIDEO_CODEC_VP8; case V4L2_PIX_FMT_VP9: - codec = HFI_VIDEO_CODEC_VP9; - break; + return HFI_VIDEO_CODEC_VP9; case V4L2_PIX_FMT_XVID: - codec = HFI_VIDEO_CODEC_DIVX; - break; + return HFI_VIDEO_CODEC_DIVX; case V4L2_PIX_FMT_HEVC: - codec = HFI_VIDEO_CODEC_HEVC; - break; + return HFI_VIDEO_CODEC_HEVC; default: - return false; + return 0; } +} +EXPORT_SYMBOL_GPL(v4l2_venus_fmt); + +bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt) +{ + struct venus_core *core = inst->core; + u32 session_type = inst->session_type; + u32 codec; + + codec = v4l2_venus_fmt(v4l2_pixfmt); if (session_type == VIDC_SESSION_TYPE_ENC && core->enc_codecs & codec) return true; diff --git a/drivers/media/platform/qcom/venus/helpers.h b/drivers/media/platform/qcom/venus/helpers.h index 3de0c44..725831d 100644 --- a/drivers/media/platform/qcom/venus/helpers.h +++ b/drivers/media/platform/qcom/venus/helpers.h @@ -19,6 +19,7 @@ struct venus_inst; +u32 v4l2_venus_fmt(u32 pixfmt); bool venus_helper_check_codec(struct venus_inst *inst, u32 v4l2_pixfmt); struct vb2_v4l2_buffer *venus_helper_find_buf(struct venus_inst *inst, unsigned int type, u32 idx); diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 98675db..afe3b36 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -413,6 +413,8 @@ static int vdec_enum_framesizes(struct file *file, void *fh, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); if (!fmt) return -EINVAL; + inst->fmt_out = fmt; + inst->hfi_codec = v4l2_venus_fmt(fmt->pixfmt); } if (fsize->index)