From patchwork Thu Aug 18 02:25:06 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: 37336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp60424pzh; Wed, 17 Aug 2022 19:25:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Go9VXcBbn1hqMNDozSVReg5m1Ej2dPWwKM/Kfae/AT9YafxHGswxD608Xew8CvYLmXO8V X-Received: by 2002:a17:907:2721:b0:731:2aeb:7940 with SMTP id d1-20020a170907272100b007312aeb7940mr546371ejl.448.1660789529062; Wed, 17 Aug 2022 19:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660789529; cv=none; d=google.com; s=arc-20160816; b=CiBUa2gWwZaxMqgEv2aLfGHgfifRnhZXHE261H0RYKX8yc0MkFANF/AbLC+f9fDD1g eihQi0/TQg5/Pg0nsr1n3mEDHxnnntp7fjFn6RaKAL2Kr9e/QagTguR5mtFFOp4YL8uw gXqU/rf/a5ootiWcz9AeSRmdV6pR0U/6UQ8iOUh0T/D5o7Pf4Xh6WRi+NrPh9DrK5xlY x+O1IH6xaeNtEj46u6zZ3iMTzjvWyugfzppwQyfs38RwIrOhTKiQOebQNX5dR4Hqnt1Y 7sb0cf3iTODkUWmL0kzX4UWm4NcpTCKJZ0uAKJkG2rlWyv20xG0RkXRF2XlUte6qOSJt t1hw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=DDECaJpBSGmvP7B6zPQ9X2ec+5fBmIpr5sn+ku4iqdI=; b=U2fSYYsSv+xBwxClwe7McPIqy/eYAlWBKZi7ah00buT9TPLHTe6P6EJvCyzRmH25XX /7U3t9M6Iu8z4kDv/Umtje62TDfB3tXx2rNr8KpvTI4+uLR76ciS2c7/KsLbKD/wOFEZ uqLANXfCE/NiqsA8p+ehk2RTK+8igXD438k4B89bdFVz3UgOMklOuuagtu4Y+QPRdpZx 3CBZV1v9huU25Xb+pYVv5bOyD3GIPVAm2GV2FI/OUtNLax1kAyMUI3OAIc39A2ngwzS5 TINB8mikIUVrr0D9208/WhgfTPzb/k6CgFqOBhxLu12Czzu90aKBTD0JaXVpEimJEKRX DoQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=BLfObAi0; 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 hc44-20020a17090716ac00b007317ce725adsi176089ejc.936.2022.08.17.19.25.28; Wed, 17 Aug 2022 19:25:29 -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=BLfObAi0; 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 9E46568B969; Thu, 18 Aug 2022 05:25:14 +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 AD6C068B4EC for ; Thu, 18 Aug 2022 05:25:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660789512; x=1692325512; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cnz/IapPr23Q7qVj+GyvcVMf86PNhDxImPsaqe4bw4M=; b=BLfObAi0OMHMj22cZUBNdwPHGd+Aez/S2YKSQB9aqcU00MNKChcw2OxS dOTXkHGLKe1sNQ3jhvUgeJGs7XUjrch1qyrVzQjk+ozs53SP5OT7JmAGC yjY7rnJ7JUdS+y0MLtb5UREW4P47Rg5g8YToHm5KDGJvDIrOiBQ1E5+sF tzzALH1zoAYMFazrnd+DTGUtP021z7UnVe6xHr7H+bs1+qXbzQm5fphTH UWvkyDiqVDdQv71pRXnnduNdhybfPfdpOH8t8qL3VqnRedOGwauoImKl3 aBYkVEtVE5qkOvufquhiXvzfsHpHJwdcPJpet8FA2Jk8jvZpo0hsh2N2M w==; X-IronPort-AV: E=McAfee;i="6500,9779,10442"; a="378941403" X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="378941403" 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:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,245,1654585200"; d="scan'208";a="935613383" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga005.fm.intel.com with ESMTP; 17 Aug 2022 19:25:03 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Aug 2022 10:25:06 +0800 Message-Id: <20220818022507.1780806-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220818022507.1780806-1-fei.w.wang@intel.com> References: <20220818022507.1780806-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] lavc/decode: Add internal surface re-allocate method for hwaccel 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: FEG6fixnIoJJ From: Linjie Fu Add HWACCEL_CAP_INTERNAL_ALLOC flag to indicate hwaccels are able to re-allocate surface internally through ff_decode_get_hw_frames_ctx. So that hwaccels don't need to reinitialize all hw configs when decode parameters change. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/decode.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/hwconfig.h | 1 + 2 files changed, 37 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 3b69426c09..6a22627036 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1174,6 +1174,33 @@ static const AVCodecHWConfigInternal *get_hw_config(AVCodecContext *avctx, enum return NULL; } +static int hwaccel_realloc_surface(AVCodecContext *avctx) +{ + const AVCodecHWConfigInternal *hw_config; + int ret; + + if (avctx->hw_frames_ctx) + av_buffer_unref(&avctx->hw_frames_ctx); + + hw_config = get_hw_config(avctx, avctx->pix_fmt); + if (!hw_config) + return AV_PIX_FMT_NONE; + + if (avctx->hw_device_ctx && + hw_config->public.methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX) { + const AVHWDeviceContext *device_ctx = + (AVHWDeviceContext*)avctx->hw_device_ctx->data; + ret = ff_decode_get_hw_frames_ctx(avctx, device_ctx->type); + if (ret < 0) { + av_log(avctx, AV_LOG_WARNING, "Failed to re-allocate hwaccel surface internally.\n"); + return AV_PIX_FMT_NONE; + } + } else + return AV_PIX_FMT_NONE; + + return hw_config->public.pix_fmt; +} + int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) { const AVPixFmtDescriptor *desc; @@ -1200,6 +1227,15 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) return AV_PIX_FMT_NONE; for (;;) { + if (avctx->internal->hwaccel_priv_data && + avctx->hwaccel->caps_internal & HWACCEL_CAP_INTERNAL_ALLOC) { + err = hwaccel_realloc_surface(avctx); + if (err < 0) + av_log(avctx, AV_LOG_WARNING, "Try to re-initialize all.\n"); + else + return err; + } + // Remove the previous hwaccel, if there was one. hwaccel_uninit(avctx); diff --git a/libavcodec/hwconfig.h b/libavcodec/hwconfig.h index 721424912c..7405c66c07 100644 --- a/libavcodec/hwconfig.h +++ b/libavcodec/hwconfig.h @@ -24,6 +24,7 @@ #define HWACCEL_CAP_ASYNC_SAFE (1 << 0) +#define HWACCEL_CAP_INTERNAL_ALLOC (1 << 1) typedef struct AVCodecHWConfigInternal {