From patchwork Sat May 25 10:30:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49239 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2239537vqf; Sat, 25 May 2024 03:32:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrenkx1PluyDeitqFfo7TvSvyS9aIDtktACxPQGz28UbknofLigBXl4xIFNCZSZVp0MmcT5upfBWdsuj6a+CbdQAQnxIOrzUExew== X-Google-Smtp-Source: AGHT+IE5AObTSNmBl/O6vcLSVZNOVaU/Exztw7b9LnmCaEyEfriQY/nlLqHTXPXstn8WLYa+wam3 X-Received: by 2002:a17:906:32c6:b0:a5c:deb3:19ee with SMTP id a640c23a62f3a-a626525c292mr257214966b.6.1716633172680; Sat, 25 May 2024 03:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633172; cv=none; d=google.com; s=arc-20160816; b=KhWV9S8RgJNjy8tfLB3JUuuObrTXpWbOm4UouKJmHWGn9oRm7wRs2N6F5uIXKG2VuT iB73LdTNHbWmtE+8IZ6hQp/LTBcCJdvOtWvQ5inrcfDyVLljbrlkB0I/If2mptFuruXZ EJ1M6rcgkkz3JBZdABfn0/ShPMqjYEOiR8KH3eK+JGMqdUsOXJlmNpXJx3iqIOCoOAye PlAR3aPldKBYiltSL0GNbkIf1u4aqsf25qnNjIG3RkxXrcjAtU8gKScVvkQ81sz98Xq+ xneGZmusR4KIKR0qfg2C8hcZ8xt8qanisQJ/fqU/QLepUhtfd+IwZuS9s0F2pH6ZqKSh Wmuw== 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=6wDb9FdAOrmeh12WGXygL2dT2ehu0bEA5kQ6oJjZeFU=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=wn+rVazHgyhUTEPvFl+XhZHMEkLE7T8zZGMR5zf9/WNjjBvNwt40ekDAnLrNrQe65q AwJZDVbjgAy25h+I4OrB5D7qEXQak8jLEYRs8H8uWE8/f2Q/mOzQ8dKBsyIFqjA59f6A PrMCaUEwfxn2fX1n+QvXE3SqcdT7fmO03Lilf1qJ1VrVTNtbmE2e1dRfu0Fu5K+rgaFh DsAhez0JxMYeMwiW5SsnEiUWY0JcpnPWrA1tT5nxv1dWzcs06jIh2tFH/UgF8WpFj9fa p5p7i9CCgNZkyAH+dJ7m4OZ5UYaRtWYffQ5bZBnW43/P/D1KQfvrQ4UfShjHKUw7N6/L r1JQ==; 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=DKCVDeIa; 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 a640c23a62f3a-a6281e2354esi124003166b.91.2024.05.25.03.32.50; Sat, 25 May 2024 03:32:52 -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=DKCVDeIa; 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 252CE68D59F; Sat, 25 May 2024 13:32: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.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11FF968D58E for ; Sat, 25 May 2024 13:32:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716633134; x=1748169134; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UHVhPZdXVYdfV+aAuyW+JXAh2kdiK59l+rKa0N1HpSQ=; b=DKCVDeIaZMAeudU70ehQ1TXR0rilP+fDp/OEIgy8kdj4C/WuPnloRzNe Pjo3Hn89ensCag/QCZ8R/ds9FS4Y/lYx8anLtq33kEFn7cDuFeFm7Cn3H t4A/fOkFGAPKYrNb/opSjI5xOKmu8m713iFZFvtaSoLjPPDBOk4KeZnTP 0TSFPOnlAKIk4XaoqBav9XPKt+n7HiJUn/+Kfi6XndhkKSW0GFat7SpGm CYYczmmi//L4EzeTcI0J13Pc+RkwTkzUeWrmf4bTCvyzyvDyenTVCp34R Lw41QoQE2lDCIN54JwT+gbvTU4esWJnJakAjU9Us4mC31Vp50m4XcAueZ Q==; X-CSE-ConnectionGUID: tZE1kWSjSDqvZZrDtMrguQ== X-CSE-MsgGUID: tTd414cGSvmU6XbO68455A== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391099" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391099" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2024 03:32:02 -0700 X-CSE-ConnectionGUID: SQKiUFx5T72B2fx/g3MxnQ== X-CSE-MsgGUID: A/sk31YmRaywGcCjCZz6mw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252402" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:32:02 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:12 +0800 Message-ID: <20240525103022.1390-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240525103022.1390-1-tong1.wu@intel.com> References: <20240525103022.1390-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 05/14] 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: 20e9B1gLGYNi 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 54bdd73902..194422b36d 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;