From patchwork Thu Apr 18 08:58:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 48139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1551855pzb; Thu, 18 Apr 2024 02:01:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWS9tb2sjicnHn8Gr37siVe7ODEa1MDdJ6/2DVHwDjZ0Nc454h9d78G3n6+ZoEVaxg0kVnqDsb4whsvdpkul+KQtU5ifnffmaIMew== X-Google-Smtp-Source: AGHT+IEIouwZvIvuRcCibY4hKMYlyYXDZneut3eb4tUOtBKyK/QRwseuL1pA9Lr02+iwGg1acCJW X-Received: by 2002:a05:6512:23a9:b0:517:79db:e85c with SMTP id c41-20020a05651223a900b0051779dbe85cmr1498674lfv.4.1713430895681; Thu, 18 Apr 2024 02:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430895; cv=none; d=google.com; s=arc-20160816; b=Daq6ASZ0Sk+MM7hSm0rS1fttZBMTwszGHUYl1Uayr8s89l3xin53AI9ys2QvbYQ7Li Mm6EL7/NvaV0c+P6Hs0wE5hYWt4pqnnMtqUpiw004uQoj15+ULuSi1GTMCyHvCc/wRyC Y4uKl5mJBWlqDLAFokKafKdaXjV4mdi0bzVF0mpFMFRVye0wf1cUsFs8+Ns3RjTA/0z7 vRCW1NRIhAVOPoz47fsKnYouBtWVlnV3lI/5/SY/InGhYj7bs6Gxf5nL0DPQcFh8Ocg0 mTUgwuYKIo/t+ZmDShgUmpaIrUaZr9bLMaaGcm95skZuRC0sRSY4V4+1VVA+tzeUEO7Z SyDA== 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=DruZqgCM0Ll/K9SNdY0r0CexfVTk23BkLKZDcD+w+o4=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=Vdp63UHnh2xS5K1qDATE0aetvuQOFOcyjTZNYITu6wJizLzQ6lidoaElc+9+fiboV/ ueHqV26yk7bCpYHszoVT2I26PwcLr131hOWaeX1fHWh4BxOBEx5EsLqQKM11vReSyxWJ Nv0PyZ1Wb2Y868QaUeuv369tdzatcOb6ltw289dfIE4hYPfCOpQzXo0spQAowo7rkD58 CFXDEqmuneDicu2NZwHsTcd4Io2DscGlh1I9FdibHwx3ODgorWZ+2xmFcas58yq95pTv 3TBlUMr4AM1M9ujCh1bnCtUyDJx1AkR04XnklMf4nILEFG7uuCpHhObBFUYyenotIelB 4wTQ==; 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="d/ytDRDf"; 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 lc1-20020a170906f90100b00a4666ecd61bsi588165ejb.217.2024.04.18.02.01.35; Thu, 18 Apr 2024 02:01:35 -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="d/ytDRDf"; 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 383F468D435; Thu, 18 Apr 2024 12:01:06 +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 66E6768D40C for ; Thu, 18 Apr 2024 12:00: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=1713430863; x=1744966863; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=k+Cd3SbMsZI2AOBFYmvXlX99kdjYu6SRZFiVO28Uq+c=; b=d/ytDRDfmeVojAuibZSHQCwXni2dGTkIMqximCppdw82a94+JT1dBjBk gVtQXPhNgsHRC/JD9QHVjAOozz2Gf8SD7Q6IXfq+RGNs9DZrXOqUekQFa YUCYR/nnjL0fZLzZwESzPGdLSWlClZncHnpA7M8eKVqvLckE875lccjkM Aj4RAkpE4HxSnC0wLx5hna6ayCGupP3Wl0SI6Ui4s4ffNF6gc40uzjoSv cnO+JX1DxrO9zWp7Y+WDK9pBuLXNLswqXB7ph2gzGIRt9MFYX6kEBmc4n U286NKW5Dd0KHPn/8zKu+CejPl3pqFZHcIilnXOgikCy9CY5Pft4uj/qG g==; X-CSE-ConnectionGUID: QMp8ybbHSveknoOF0u9RAw== X-CSE-MsgGUID: 1WyMJOi6TiaIpdopjF98DQ== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="12748319" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="12748319" 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:52 -0700 X-CSE-ConnectionGUID: tceQfAYGSTK/0R6Rv4xW6w== X-CSE-MsgGUID: FspdHqraTSCUd1b+21XQnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="54127544" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Apr 2024 02:00:41 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:58:58 +0800 Message-ID: <20240418085910.547-4-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 04/15] avcodec/vaapi_encode: move pic->input_surface initialization to encode_alloc 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: pIkQYZnSY5tE From: Tong Wu When allocating the VAAPIEncodePicture, pic->input_surface can be initialized right in the place. This movement simplifies the send_frame logic and is the preparation for moving vaapi_encode_send_frame to the base layer. Signed-off-by: Tong Wu --- libavcodec/vaapi_encode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 2d22e4bd85..227cccae64 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -878,7 +878,8 @@ static int vaapi_encode_discard(AVCodecContext *avctx, return 0; } -static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx) +static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx, + const AVFrame *frame) { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodePicture *pic; @@ -895,7 +896,7 @@ static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx) } } - pic->input_surface = VA_INVALID_ID; + pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3]; pic->recon_surface = VA_INVALID_ID; pic->output_buffer = VA_INVALID_ID; @@ -1332,7 +1333,7 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame) if (err < 0) return err; - pic = vaapi_encode_alloc(avctx); + pic = vaapi_encode_alloc(avctx, frame); if (!pic) return AVERROR(ENOMEM); @@ -1345,7 +1346,6 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame) if (ctx->input_order == 0 || frame->pict_type == AV_PICTURE_TYPE_I) pic->force_idr = 1; - pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3]; pic->pts = frame->pts; pic->duration = frame->duration;