From patchwork Tue Aug 23 08:19:27 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: 37411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1743165pzh; Tue, 23 Aug 2022 01:20:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR6DpGVK25kneEsduGfRsm/FPd2eaX4XgeTnNNbNMzAh24m+3VOYR9CMybANvZyG6jAfBgTG X-Received: by 2002:a05:6402:3507:b0:446:9e4e:b538 with SMTP id b7-20020a056402350700b004469e4eb538mr2746637edd.56.1661242808625; Tue, 23 Aug 2022 01:20:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661242808; cv=none; d=google.com; s=arc-20160816; b=DUZLuO3OH2vfpGGc4x2Vitsfy7N8v0mQQ65YezrlbOSVnDTDPAUt7VJNAHw3j1lYSt uZTOAxSV8SIuycBcyg2MWVL9V88LYB2kst3UOvNLZsSYCItPGBaOzU+3HTZyLLsAcHvN g5VMy0n8cTk/6fSWkFDhmmwuyuy1ZsF/JdLiVaPJZghsW2Q8L9aRUOeG7T96h60YjX72 +V+yaxSSnlqK6A+VxDF1n+wGJs2ap4Wa5DJC8a4c22BcaimAfqNRWxh7xcAqJWLYf2gL wBjyF5LKHLUtV/vatw6URm9OBUgSMu553Ii4MC4pkJ3gah+h/S3X1qsTBCll/mPbq2HJ i+qg== 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=Z4S7N927nX8v/swpjRARQ9yYNSwyUvKb3YJPD4CNsOMRLTIWdBjdUXpQiHq+AxQ/FS Ozliq7H6gabCqnSv9Tu2/OCrwoVl/18tHTyb3/FkwlkMI1LPB6nU3tRUMi+uqWd+7XGR xwPW8BwkrTMCwMliaGDnqX0OBte1Ggc92VYdeIjQxH1JHJws8kTOXVNl7Xnnu/yBC5dH pylVVoyJNfld9WuOYIuqVkv2z2Hgn3KC7pRezvXqS+NAwNtCRw2wTL8Q2Ui2XZif+2nb rhlHkXhaOPEsr2TQiwn5HGlTNdrE9r6zaXOhvvvkM3NcgwLDdJ/5IM384Lqy9/xljIwS /vig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Z7ylsLRQ; 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 hr40-20020a1709073fa800b00732d464930bsi14452954ejc.683.2022.08.23.01.20.08; Tue, 23 Aug 2022 01:20:08 -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=Z7ylsLRQ; 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 3999368B842; Tue, 23 Aug 2022 11:20:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23AF968B842 for ; Tue, 23 Aug 2022 11:19:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661242804; x=1692778804; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=gaqKNOlL0RBxPFi4ZlzjJsALt/9LjB8PVRPfSG1rqCg=; b=Z7ylsLRQ8BTg9xyiULQU/loWik9PUl2Wv29O/6xVfSjIbDT4Fpgxgtdl 08Y0fz17bEe+TTIXFlZpKouWFET9lNyBIT/3/vWKMB00juNayvVSCZpcJ JRmU8zUQPZisf31u7FIYwNjrhVdsPYbgsp7zA6Ath9fhqyPQx/krm57iu m8wHyzZZH+N5Sh1BUvlM1uOIulT/KvlXIUAjvlo49NyRNB99GZOQmt1nG VE9ZbQabUxBy+LKI+WQNKscQWyrX83Hqct0DSrcsfH8gLRv3av65euFTF 3ihaufjcmZn2g6vrV6/ofN2+K+X/5pqMW5oJOObXVlQtWqvCqg3A6sguV g==; X-IronPort-AV: E=McAfee;i="6500,9779,10447"; a="357604433" X-IronPort-AV: E=Sophos;i="5.93,257,1654585200"; d="scan'208";a="357604433" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 01:19:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,257,1654585200"; d="scan'208";a="638556912" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 23 Aug 2022 01:19:56 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Aug 2022 16:19:27 +0800 Message-Id: <20220823081929.413947-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: drE/r/OXLKbv 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;