From patchwork Thu Mar 14 08:14:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 47048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp284819pzb; Thu, 14 Mar 2024 01:16:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUM85gB+56Ohu0s5tdEnI3Mt6EOYK0MIAk8CLYv7V/hpVU4njomAbILgJ74z3JXRYpZg8tU+1ZdrtKPsQwud4+AiTQ1U8o/zYUDNQ== X-Google-Smtp-Source: AGHT+IGnKlrDoP49K8cjisWWTu8o/IheTD+/LwQ3fWZAUlxu3RmaaT1DNRcrpbbbNgwNDJ7ohvMz X-Received: by 2002:a2e:3507:0:b0:2d2:a2bf:4ae6 with SMTP id z7-20020a2e3507000000b002d2a2bf4ae6mr624572ljz.31.1710404216603; Thu, 14 Mar 2024 01:16:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710404216; cv=none; d=google.com; s=arc-20160816; b=gwsL/0zAOs4wzmRT2EkHoyx50N8Wq3qHMEBJwKbKTy11vM/9TeZntjPIZldOMLCJP2 ie/eZZlUjwfC0Zt4KRFYNrXucJ14qc6FT6+7j6GhGw3JQa8BE/N22BjkgNFC6Aw3qoWi uAN2dAHKzyL2Q8ZBDqHUAj1x7y+8aPtBu+JNlzQdqbfHAbGbyl+etkEjI24+Uea4rx9i itpdlDP5+CQV6fEUsuM7tJfu/wlyQNFEbCN4G+9SNssBV3B6KC3Rs2u/maDXhK0ErKlH IerP8j0b3IRIhcgy9XtKa3su3NsANLOLkvOvpSuroJyfkFA4APTEE9yeCEBABsuvAkob eS6g== 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=VvLi+GhD8oefOmJU1q/+PaLqHbw5AAxOlVFc6ROVZgY=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=xKai+bmDz6wos7LEA1L3Ss1qmecXxCCGKIjvp+7AnJNQYO7SQFAOCX+v1ODo4HujMB C/ZgXYlw1E/1Pf0dNFDJn4speRCyyeVp/sExTIJNaFogCCLxVbzcn6WAj4tp3kNHfODy HTB7HPMTsQZOqN+ZHHO6cDTyv+2vtjtCZ/cxUH+LNf1PL+HljUAp++NQyLrjJp/B+4LB 5e2rIPLf87dm/ZPaYfC5YPanOpfmtGBfYsS08ct+1CrE1V04JIS7t9SSCmsyCkhIO0IW Xfyp2jYH9LpTfiECff9SG+35I+ivVH/HU5KGbRkZYqQOBurqjWYt9jt9lENNvyTED2zN 04yQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=cLlAuzGc; 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 ef11-20020a05640228cb00b0056864832654si499384edb.524.2024.03.14.01.16.56; Thu, 14 Mar 2024 01:16:56 -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=cLlAuzGc; 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 5FC3268D18A; Thu, 14 Mar 2024 10:16:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C12C68D13C for ; Thu, 14 Mar 2024 10:16:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710404176; x=1741940176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QwQc+6bciEA2fPKfWGlOQ0DCpeBj4lco2MBc5NGsBWg=; b=cLlAuzGc36c0FCuz3rSPWiVNQ4ae0cS7RbzYrp9ky2rOnKtM1pSu0Uud sqlBBR+Sqi7Qy6HggUQvIMTCFA1K/bmEqXUl6vl1DVAQdFumKdWItDKSa m1CE6nulOjrww17Asi0rF04D57PjeZZGAGf+TMoWNOAVqLtf4V7mA9Oub /j9RpA5VxVilB6nbulFDKsWXhJsL73viEErDxMfn6FFyVPCSxXUabDYAw hMULKuFa91qN+B67DlLXPpFaLKP8/G/wbw8oKvhc5UJqWHJ5hikYccShT z67Zen/Gcu6JIcibVTHXt/ygkgeq74gqag/IyvarU5w5Wh6fq//XfBSPk w==; X-IronPort-AV: E=McAfee;i="6600,9927,11012"; a="9029377" X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="9029377" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2024 01:16:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="12095268" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa007.fm.intel.com with ESMTP; 14 Mar 2024 01:16:04 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 16:14:48 +0800 Message-ID: <20240314081456.379-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240314081456.379-1-tong1.wu@intel.com> References: <20240314081456.379-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 05/12] avcodec/vaapi_encode: extract a close function for base layer 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0zzUjYqJTbQn From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.c | 16 ++++++++++++++++ libavcodec/hw_base_encode.h | 2 ++ libavcodec/vaapi_encode.c | 8 +------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index 71ead512c0..754f990ed0 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -630,3 +630,19 @@ int ff_hw_base_encode_init(AVCodecContext *avctx) return 0; } + +int ff_hw_base_encode_close(AVCodecContext *avctx) +{ + HWBaseEncodeContext *ctx = avctx->priv_data; + + av_fifo_freep2(&ctx->encode_fifo); + + av_frame_free(&ctx->frame); + av_packet_free(&ctx->tail_pkt); + + av_buffer_unref(&ctx->device_ref); + av_buffer_unref(&ctx->input_frames_ref); + av_buffer_unref(&ctx->recon_frames_ref); + + return 0; +} diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index c9c8fb43c9..436767b706 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -228,6 +228,8 @@ int ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_hw_base_encode_init(AVCodecContext *avctx); +int ff_hw_base_encode_close(AVCodecContext *avctx); + #define HW_BASE_ENCODE_COMMON_OPTIONS \ { "idr_interval", \ "Distance (in I-frames) between key frames", \ diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 887543734b..ffac27a08f 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -2412,16 +2412,10 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) ctx->va_config = VA_INVALID_ID; } - av_frame_free(&base_ctx->frame); - av_packet_free(&base_ctx->tail_pkt); - av_freep(&ctx->codec_sequence_params); av_freep(&ctx->codec_picture_params); - av_fifo_freep2(&base_ctx->encode_fifo); - av_buffer_unref(&base_ctx->recon_frames_ref); - av_buffer_unref(&base_ctx->input_frames_ref); - av_buffer_unref(&base_ctx->device_ref); + ff_hw_base_encode_close(avctx); return 0; }