From patchwork Thu Apr 18 08:59:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 48145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1552654pzb; Thu, 18 Apr 2024 02:02:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOKxnXCb2XWW6cf7hzv47sZ5pVYBjd2IdW1ZWOett0W09TwhkaoaiWtCiIniHlQGE0jkkqySysl73LdrgOblG413ylxG0NeH81FA== X-Google-Smtp-Source: AGHT+IFl3JHx1gzYs49+wYCi3WQdmZ35ZynI5shqoaNLTjSnvriBlvKLZZTMYH7GMyAZKOL+5lWV X-Received: by 2002:a17:906:2c45:b0:a55:57cd:1ccb with SMTP id f5-20020a1709062c4500b00a5557cd1ccbmr1219365ejh.19.1713430977357; Thu, 18 Apr 2024 02:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430977; cv=none; d=google.com; s=arc-20160816; b=dTkatNfCyyAvJ+eJt/CoJGO+cwstOCk6LBeofwswFG5DPWgG0KrxC+J4j2+Awt6VyH Lml7UnRbq6XAM/JMiemtx7aeOYL2Mzvydf5XLfBf5xLEC2QNf9LmfLFeE3BiUJhvnPTE w7f34GijvUQ4eY4P0iH5Yp5ptomTZbqkK8Of5OSCCMPPGkE2fGnA8oduDVaM2sMRSbs4 0wtCsxQS66A3x+qMe5NhaGkEF0EoKjAdZfcvdga/gU4aKiAEPeHGYiwrpqcSGNoJYksl L22pSEVp5g5I23sCVfsmptsaXN8MqWyDWHa5a27V9weda4BD0LjfVgVbYiGzN3egh3fD gRTg== 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=HJNboPwiITuWQzQyhoPGZkWuYt0xf2JVHT+PxoGmTRM=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=vejZyZOxhec5mfYYHJFFn6BrWN69/DrZwGVOKr8BaF0WPH7f8jhijp6CMDKmOCddun 2b+AI2Vxzb23RTUrRmhX/Ax4HRqTp1vavBuBwJJ/bHrnafe8+bybqck7fICok5SmNV77 SC2+g0vt/JhzuHRMbZYV0DvutbSszMMenxVBXF3yACxv6SkqKIX7dvx0lARMFU4N108w NO+otKQTQ79t2kp1/5yBWBzyLziRL9GnGWglMclDtgqCnpxoXi6DvR2ci2fK2xpgMkOk fAGrnBldQI3TB35/nU+QL/afj+g2bIUiE4MRCYjAbIBv9zhfoD7Ckya9tUAnksNzUqNo nb1g==; 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=RD314kXT; 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 y20-20020a17090629d400b00a51a664500esi602956eje.59.2024.04.18.02.02.56; Thu, 18 Apr 2024 02:02:57 -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=RD314kXT; 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 6887268D469; Thu, 18 Apr 2024 12:01:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 865BD68D43E for ; Thu, 18 Apr 2024 12:01:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713430871; x=1744966871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CELJPe4NDe4H0UYe3KLPgHmGtfG1MP+i7cLB1awv+MI=; b=RD314kXTNx72PGPJdBDnR5/9f8PekA2ZX+k0ufEdLxV+l0ZWfKugeL6+ ReHLxWOjfySu0bGB9MvV6ximPV5irj+kU7ZHrBQ/MU8dHwk+ALr1a5mt/ hrSNeBUJb3G8zXovzB7SI2skbhHhDgzl9JrUFiao8pKax2LXswOqN/mwJ DIRKX+LbtAN12ndVAFxd1nt7F+U1IoHbIYmJUgt5NURIeenRUXdqUXMDH NAcQ6NIitFfEA8/kvLx8edvvSqlxwRRpu2sSbMF2nmdBfiY283MDmJV4p DBm6eoVtr1AMG8a6Z2GZd65jJNfzuogGzYGlM2i2bd1iGMlBurZiYVjPM Q==; X-CSE-ConnectionGUID: r/rtieGxSWKMdyxv7XTavA== X-CSE-MsgGUID: bzdZ14ulT1CGLqK4LdSXqg== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="12748332" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="12748332" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2024 02:00:55 -0700 X-CSE-ConnectionGUID: WkJ2ZwYWT2uhWokKrspBWQ== X-CSE-MsgGUID: l6H2Gy0MSJ2lAKA1YnS+Hw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="54127575" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Apr 2024 02:00:50 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:59:02 +0800 Message-ID: <20240418085910.547-8-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240418085910.547-1-tong1.wu@intel.com> References: <20240418085910.547-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 08/15] avcodec/vaapi_encode: move two reconstructed frames parameters to 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: u7rwGSMy3P39 From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.h | 4 ++++ libavcodec/vaapi_encode.c | 22 +++++++++++----------- libavcodec/vaapi_encode.h | 4 ---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index 1f6d7882bc..3eea3ef998 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -134,6 +134,10 @@ typedef struct HWBaseEncodeContext { AVBufferRef *input_frames_ref; AVHWFramesContext *input_frames; + // The hardware frame context containing the reconstructed frames. + AVBufferRef *recon_frames_ref; + AVHWFramesContext *recon_frames; + // Current encoding window, in display (input) order. HWBaseEncodePicture *pic_start, *pic_end; // The next picture to use as the previous reference picture in diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 993b2640a9..8640a888b7 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -314,7 +314,7 @@ static int vaapi_encode_issue(AVCodecContext *avctx, av_log(avctx, AV_LOG_DEBUG, "Input surface is %#x.\n", pic->input_surface); - err = av_hwframe_get_buffer(ctx->recon_frames_ref, base_pic->recon_image, 0); + err = av_hwframe_get_buffer(base_ctx->recon_frames_ref, base_pic->recon_image, 0); if (err < 0) { err = AVERROR(ENOMEM); goto fail; @@ -2149,19 +2149,19 @@ static av_cold int vaapi_encode_create_recon_frames(AVCodecContext *avctx) av_freep(&hwconfig); av_hwframe_constraints_free(&constraints); - ctx->recon_frames_ref = av_hwframe_ctx_alloc(base_ctx->device_ref); - if (!ctx->recon_frames_ref) { + base_ctx->recon_frames_ref = av_hwframe_ctx_alloc(base_ctx->device_ref); + if (!base_ctx->recon_frames_ref) { err = AVERROR(ENOMEM); goto fail; } - ctx->recon_frames = (AVHWFramesContext*)ctx->recon_frames_ref->data; + base_ctx->recon_frames = (AVHWFramesContext*)base_ctx->recon_frames_ref->data; - ctx->recon_frames->format = AV_PIX_FMT_VAAPI; - ctx->recon_frames->sw_format = recon_format; - ctx->recon_frames->width = ctx->surface_width; - ctx->recon_frames->height = ctx->surface_height; + base_ctx->recon_frames->format = AV_PIX_FMT_VAAPI; + base_ctx->recon_frames->sw_format = recon_format; + base_ctx->recon_frames->width = ctx->surface_width; + base_ctx->recon_frames->height = ctx->surface_height; - err = av_hwframe_ctx_init(ctx->recon_frames_ref); + err = av_hwframe_ctx_init(base_ctx->recon_frames_ref); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to initialise reconstructed " "frame context: %d.\n", err); @@ -2269,7 +2269,7 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) if (err < 0) goto fail; - recon_hwctx = ctx->recon_frames->hwctx; + recon_hwctx = base_ctx->recon_frames->hwctx; vas = vaCreateContext(ctx->hwctx->display, ctx->va_config, ctx->surface_width, ctx->surface_height, VA_PROGRESSIVE, @@ -2404,7 +2404,7 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) av_freep(&ctx->codec_picture_params); av_fifo_freep2(&base_ctx->encode_fifo); - av_buffer_unref(&ctx->recon_frames_ref); + av_buffer_unref(&base_ctx->recon_frames_ref); av_buffer_unref(&base_ctx->input_frames_ref); av_buffer_unref(&base_ctx->device_ref); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0d3d8e2ed0..76fb645d71 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -213,10 +213,6 @@ typedef struct VAAPIEncodeContext { AVVAAPIDeviceContext *hwctx; - // The hardware frame context containing the reconstructed frames. - AVBufferRef *recon_frames_ref; - AVHWFramesContext *recon_frames; - // Pool of (reusable) bitstream output buffers. struct FFRefStructPool *output_buffer_pool;