From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 398494B2C2 for ; Mon, 3 Jun 2024 09:21:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2FDE468D695; Mon, 3 Jun 2024 12:21:07 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1307D68D689 for ; Mon, 3 Jun 2024 12:20:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717406465; x=1748942465; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UHVhPZdXVYdfV+aAuyW+JXAh2kdiK59l+rKa0N1HpSQ=; b=ldtgoOOQfgNMa+xOZGLPEuCPidNwO6UNy+aUeZggFwSgBFGCqorC6nhU hBxVEcjM5a7MIO1jhwFIgSCz/Axi85huKgCXXvYUFMpIHHX0fGJb8w8jC y67PBr8MBmwYUd4mag87SKOVGnRKx7mxxLwCEr1xuluCwX22rsUJp2X2/ SMlZynVyuZiTk1DSvhQ+TjEBEROhM+EV66aMuEkQGv6wfVgEPP3DmceRv aUJLLycjPeqFI8cezPMm+YeGbSbSnGogM4Fy5n+e+OPJjqaniwBYYoxD7 dRvK4CL3Eq6fYI4dnU16QTyG4f68jtdvcCkhDQEET/WtFu1ay1KSmkvD4 A==; X-CSE-ConnectionGUID: RfeBUgo3RdiHuFVFLkZmKw== X-CSE-MsgGUID: C2lMHq3aRe+QaeCiMpUBEA== X-IronPort-AV: E=McAfee;i="6600,9927,11091"; a="14076849" X-IronPort-AV: E=Sophos;i="6.08,211,1712646000"; d="scan'208";a="14076849" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2024 02:20:54 -0700 X-CSE-ConnectionGUID: ll5wJg7EQ7yC5lqB+QnRbA== X-CSE-MsgGUID: to+80kxqQByZ1wYmQY/u1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,211,1712646000"; d="scan'208";a="41750465" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa005.jf.intel.com with ESMTP; 03 Jun 2024 02:20:53 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Jun 2024 17:18:58 +0800 Message-ID: <20240603091909.1161-5-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240603091909.1161-1-tong1.wu@intel.com> References: <20240603091909.1161-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 05/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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.41.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".