From patchwork Fri Aug 12 12:55:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 37246 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp980029pzi; Fri, 12 Aug 2022 05:55:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Nx9K3Xt5R6eXmgMNFW/2/tH152+yknl46HX+qbqpbaO7VmeFUkWtzO1MkD3r0gHckTrzc X-Received: by 2002:a17:907:2c42:b0:730:aacf:1b69 with SMTP id hf2-20020a1709072c4200b00730aacf1b69mr2598818ejc.381.1660308942876; Fri, 12 Aug 2022 05:55:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660308942; cv=none; d=google.com; s=arc-20160816; b=ov3vzgS3/QzStuEypBnj9QF6mYiMgjgnURNOdlFyYfRziGaZpANlOkEymCeiwpYeEk DcNCgGmZh43IqNpwNCZSkO7Y4HGZcznFJe/wITn9YH3CbCkhDHxllPTD7iAMb9c6Cndp lM+0iyvjYSsPwSWGNVreCR7Jthvb5NSpIIIH9/fecJyERVURekeiFTSylpgrDRsll5+o YBoOzgNtb/22Ece35h37KZQPo2udIHLni3e/rj2LWiU+9TTZWWuElkApUbluoGwP3KUY nt+7oNUTQQ+Xaq2KLxvcBphL+Y1/d267o8hW/XaCyCSrbUEVlSGw4IcQVNIdYmPi65rN hfTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=kCg/ZCIhY053R9gGukpNCTjBt6dgftyaDGdwmMnwCPs=; b=z01XapgQutYj6UICGa06k9SpiN30P/170MqgAoV8yv5VQLPgxVJClgEluDo2dwskME ejow0Doppxkwjw3E1jU23FNezEsm0hD/px0hFDnW+Oiuv6Jq2sICKoVFtJ/Bj3rLSz5l Ll4JTRHd3HMaUPScp8b4wJ9KJfY4XRIk4TuegfDXmFdhsb/kygnWMoujKZMMWTgIAobj sczM4dO3ML8aLNV7B8vDzLq4UnOf6z9xAwUtNWmBtpTgEpe45NtGAHclgqJh/MwikJCK p8FgH+p0nfzzX0dyHWso1fF6u14RkfMf4isOGeR9LrH91yOYgrpkRprDm1Rm04WNH6zM zxLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AnT7EZxl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn2-20020a17090794c200b007314ba7a583si2091339ejc.908.2022.08.12.05.55.42; Fri, 12 Aug 2022 05:55:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AnT7EZxl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B31568B3FD; Fri, 12 Aug 2022 15:55:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6915B68B3FD for ; Fri, 12 Aug 2022 15:55:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660308936; x=1691844936; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3hUtRND+iLJcpDdjWyPxwVMI+3V3KAengJA++TM3gns=; b=AnT7EZxl7vigFQ4ir/srevaRByzz73/b3FtJhnFPvE/c5ML913OeWuQY xauLnNK2Gragr9fLDeEDr1BiBcl6I5Iypogi1RYdV6Zq4mvdiuL9tsLum CMp2GGUl/qGuwgoFCO8GlcqjuA4HvmUTXVigOSoA/MJJAH3tiOwEnBRD0 TB9DNO790oXQI9/MNWYvOV8/TsKTbzFkVprXag9asP4T3fCya7F2xVpnR 81v7S6+wpbx1Mtk2cNUU9xz26LhA0g2VY/L6ltOOvNGMwZO6/oA76aBaR +07HkPlGjDEDOH8lEPXlLJoM3PORMln+1sQxfLtJRD5RVORabMEb5E3/z g==; X-IronPort-AV: E=McAfee;i="6400,9594,10437"; a="292853525" X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="292853525" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Aug 2022 05:55:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,231,1654585200"; d="scan'208";a="582081508" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga006.jf.intel.com with ESMTP; 12 Aug 2022 05:55:28 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Aug 2022 20:55:43 +0800 Message-Id: <20220812125545.1229410-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 1/3] lavc/decode: Add get_hw_config function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wmtLb1y1cAyO From: Linjie Fu Wrap the procedure of getting the hardware config from a pixel format into a function. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/decode.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 75373989c6..d66d5a4160 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1156,6 +1156,26 @@ static void hwaccel_uninit(AVCodecContext *avctx) av_buffer_unref(&avctx->hw_frames_ctx); } +static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext *avctx, enum AVPixelFormat fmt) +{ + const AVCodecHWConfigInternal *hw_config; + int i; + + if (ffcodec(avctx->codec)->hw_configs) { + for (i = 0;; i++) { + hw_config = ffcodec(avctx->codec)->hw_configs[i]; + if (!hw_config) + break; + if (hw_config->public.pix_fmt == fmt) + break; + } + } else { + hw_config = NULL; + } + + return hw_config; +} + int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) { const AVPixFmtDescriptor *desc; @@ -1213,18 +1233,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) break; } - if (ffcodec(avctx->codec)->hw_configs) { - for (i = 0;; i++) { - hw_config = ffcodec(avctx->codec)->hw_configs[i]; - if (!hw_config) - break; - if (hw_config->public.pix_fmt == user_choice) - break; - } - } else { - hw_config = NULL; - } - + hw_config = get_hw_config(avctx, user_choice); if (!hw_config) { // No config available, so no extra setup required. ret = user_choice;