From patchwork Thu Aug 18 02:25:05 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: 37335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp60386pzh; Wed, 17 Aug 2022 19:25:17 -0700 (PDT) X-Google-Smtp-Source: AA6agR7ZSizjiyAChr+UT9LHjDOf99i382Jvevakxw+O1JrDBCY5luM/SkZMGYUczjJz+3gVqxEt X-Received: by 2002:a17:907:7355:b0:738:5087:9a64 with SMTP id dq21-20020a170907735500b0073850879a64mr501225ejc.295.1660789517334; Wed, 17 Aug 2022 19:25:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660789517; cv=none; d=google.com; s=arc-20160816; b=Fcw+l/brg/51iyVTshw6TtJlmfWQFbL0UqKp6amX/ImLFVwkKPDYfnXnCmxpl61ZJ2 fMCGRyiuqXD7FI1+WjPF0RBzK5Hi9ye7yLKjqP1pH3M2SrP2YzBc2Kg1dDSG04b3eIKD plVpVk0UuF+eXlIFcADmtvGd0uQKDocCB5Qy4j6vobGomxSoIEp8D7ytmQcBzP4+eBmP ImHF4udr5nh8/LR4hxEU9ekqfbNBWoOoBT+TrfAJcEyTVmLyr8KP2OP0K+oI7siJSFVe aG7SeOwEkicHxOg3hY/8AGJx+eguA75mPfcK0A8Y5y5muK95SomiDVeeC0V8r/elwDuQ 0n5A== 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=1luuZq4TXmesY5R+BYhvfst6S3XPupgo00bNAXbMfbU=; b=N1Q9+R3WgZwg92EVSmeP9Jmk3872ZENlF+kKhDxQq2tX584GvJXdA9SfT+p8tFJrUI SvPfGFjJ9SxOMh2AVrxDlr/8ltUHRAXKDj/U+11GlU8QOC8FY8y5yERxhqognPfbGIW3 OsueMvhRp4+ehn8P0aOr7AoaMQRVpGPyF3hNM59HLRB14KOYakNCVxzeZilKE2MAhnST x063JG6MNXeLBvk+HWRkq2AqrX1ovl191ERPqbmcCxi1pElvu1QbNyBA03mOeo6QpoPM fQnZ9SH3Eso/jLHIvm3waax8pbEZb1kTfP6e9P4hYspYA+ek2Kur1hfijHsl7TXMZLT/ W1og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=EbgJ41pQ; 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 hr32-20020a1709073fa000b0073066a8f85esi197117ejc.686.2022.08.17.19.25.16; Wed, 17 Aug 2022 19:25:17 -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=EbgJ41pQ; 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 570CB68B941; Thu, 18 Aug 2022 05:25:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EAF168B920 for ; Thu, 18 Aug 2022 05:25:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660789510; x=1692325510; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gaqKNOlL0RBxPFi4ZlzjJsALt/9LjB8PVRPfSG1rqCg=; b=EbgJ41pQXKAlviBUh2Hw5FrdzzXTKOcfZHH1NJTZ7qMglPEgPw/yOwBl AyJxWXmxX0EfXYMylapQ4NCBubxb2cF+e3VO6henpHeqZjavWEBFThG9C NZ+xUjjzdVaom4EinPiizYUan4w9aHXtmjKtHPiIzUM+GkrUId8B7N2Yo P6+JkokVCOmDsitvglXkoptmHd4HN5rUCA61JheFknGg2W8nmiZmKE8J7 U2ZRp8hROqtm+hSegClMEEYtgpGA+1BhtqM7w9g9L/AmymNJiSMdA1moj oZUwqDNwpByTQqdhW2bu7xzoq7SPTJFo/54c1CPr50+NWNhNJxDlfwc/o w==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378941401" X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="378941401" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 19:25:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="935613377" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga005.fm.intel.com with ESMTP; 17 Aug 2022 19:25:02 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Aug 2022 10:25:05 +0800 Message-Id: <20220818022507.1780806-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] lavc/decode: Warp 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: sd7Qo0SwLy75 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 | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 75373989c6..3b69426c09 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1156,6 +1156,24 @@ 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; + + if (!ffcodec(avctx->codec)->hw_configs) + return NULL; + + for (int i = 0;; i++) { + hw_config = ffcodec(avctx->codec)->hw_configs[i]; + if (!hw_config) + return NULL; + if (hw_config->public.pix_fmt == fmt) + return hw_config; + } + + return NULL; +} + int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) { const AVPixFmtDescriptor *desc; @@ -1213,18 +1231,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;