From patchwork Thu Mar 14 08:14:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 47047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9204:b0:1a3:31a3:7958 with SMTP id tl4csp284770pzb; Thu, 14 Mar 2024 01:16:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkGoh5K7KT5TZvh+8IusO8mik7mrt1WUbB0HcQKz/ElVOD9YfuavWg+tgVC8iubP8BvT9Aj5bAJ07ilncqZOUbZtD18ezeg3Sctg== X-Google-Smtp-Source: AGHT+IEijfz+KuYEoa+0rdgS8mdnQDah2tmFDBYm7lgEqO7v6JhbjiGil2r9kfQFargaONbmGcH8 X-Received: by 2002:a05:6402:428b:b0:568:9936:b2e with SMTP id g11-20020a056402428b00b0056899360b2emr705333edc.24.1710404206778; Thu, 14 Mar 2024 01:16:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710404206; cv=none; d=google.com; s=arc-20160816; b=AjI9Kis6LYdesQmTJwADpCVlNxk0WV0HhapcgnqfwMdFhnS9LB6vTci+FqTT1dxfrD qioAKn6rvfUvpEWRUdAcQ3nW/+R1CpUnoq5ujuJdmYnLCAU2H7puxrEAX0RWTteqUNg/ 4yCb/aksCmx75E3A2guwIUeKXikdz9yUim0MWuMk7pZ7LWwWitQKootkG+0BcqJ0jmdW W21CW24hxEUD1VO1p9rat2q++RIf9r1+YWeOSHrGf4TSQLvOH8WD4Cr6X/0WmFvpIoG8 AJLfMP44EayWvrMr+XamA6560/CvdaXaudC8P0sjaKlIVGWy4SGMUmSgD8fcm/LbHmIR zq/Q== 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=aRpjslUy6pSwD/hJwCO/y4gWS/1ckdGw/3MXU8vcm78=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=jaYrCMVRu7fjI8DLjovQdB1Ln9CzHERaGgVs4717qui5xxZMTM8FQq2UFoPaYdDtjD KOt0MKVBJfBFNnk1P1iH0e7eVMSiLTsvrUjdQWvjEGWAmZYnV24FHvGKZUuIPzOt3AEr LR+UZlzrfjaj93B5gkWUjocsJKlziUPbVKmiJITgT9Uyv6ttJdCypQ1EA1oyUd9GCeTb Wbk3zGXUOOdJmE34NDEfHxypKv5CHSDowl1QVJIstPuk5wZA3ne6e8rlTpK4+sQJTSD8 IXx9pG1RzOj86dnOYDAEGRCDLSgoJdKeuKln3QO9X3rrTUCANP/lg/46k8BjR0KQjATY 4m1g==; 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=BqkDmD4z; 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 t21-20020a056402525500b00568a0254f9dsi401903edd.327.2024.03.14.01.16.46; Thu, 14 Mar 2024 01:16:46 -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=BqkDmD4z; 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 3308E68D172; Thu, 14 Mar 2024 10:16:15 +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 ACCD668D15D for ; Thu, 14 Mar 2024 10:16:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710404173; x=1741940173; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O613hJdn/ON3U4POGH1jx85L+wvutN4kyB3kZlGq/9o=; b=BqkDmD4zIsX76/cIA3dPIW04RcGuFRIB1uJoUY8Z4cnccwwL/BDamDbB tYFEpk2y8FIf3mVYzIyIcFfZ8UQFxbDTuZ599frV+ZxFzTkeMgNuPpFj2 yPIJsI9FmOlQxLj0l4ZXee8HE6PjB80s1p0nEJIjrY3f04GBKBmj+Zw9a cDOmXVqNOLl7Txjd2buy0n0o2QEUZw+mUC749udsdD7H5ekppk3ozVQ2K +0Pjn5Pw7W1F8PHaZSkDV5ywiizAVF4YHBeuELfjBRtWCcdT9F4sHsZR4 28YsBwpSNEDnqyBID2DisuIKORYvL43H3rq7OiXsjoWid3q2EY0p2YU8V g==; X-IronPort-AV: E=McAfee;i="6600,9927,11012"; a="9029373" X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="9029373" 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:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,124,1708416000"; d="scan'208";a="12095262" 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:03 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Mar 2024 16:14:47 +0800 Message-ID: <20240314081456.379-4-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 04/12] avcodec/vaapi_encode: extract a init function 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: 0OakUhthlNLv From: Tong Wu Move the base_ctx parameter initialization to base layer. Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/hw_base_encode.h | 2 ++ libavcodec/vaapi_encode.c | 36 ++++-------------------------------- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index dcba902f44..71ead512c0 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -597,3 +597,36 @@ end: return 0; } + +int ff_hw_base_encode_init(AVCodecContext *avctx) +{ + HWBaseEncodeContext *ctx = avctx->priv_data; + + ctx->frame = av_frame_alloc(); + if (!ctx->frame) + return AVERROR(ENOMEM); + + if (!avctx->hw_frames_ctx) { + av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is " + "required to associate the encoding device.\n"); + return AVERROR(EINVAL); + } + + ctx->input_frames_ref = av_buffer_ref(avctx->hw_frames_ctx); + if (!ctx->input_frames_ref) + return AVERROR(ENOMEM); + + ctx->input_frames = (AVHWFramesContext *)ctx->input_frames_ref->data; + + ctx->device_ref = av_buffer_ref(ctx->input_frames->device_ref); + if (!ctx->device_ref) + return AVERROR(ENOMEM); + + ctx->device = (AVHWDeviceContext *)ctx->device_ref->data; + + ctx->tail_pkt = av_packet_alloc(); + if (!ctx->tail_pkt) + return AVERROR(ENOMEM); + + return 0; +} diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index c9df95f952..c9c8fb43c9 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -226,6 +226,8 @@ typedef struct HWBaseEncodeContext { int ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt); +int ff_hw_base_encode_init(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 c6742c4301..887543734b 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -2208,45 +2208,17 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx) VAStatus vas; int err; + err = ff_hw_base_encode_init(avctx); + if (err < 0) + goto fail; + ctx->va_config = VA_INVALID_ID; ctx->va_context = VA_INVALID_ID; base_ctx->op = &vaapi_op; - /* If you add something that can fail above this av_frame_alloc(), - * modify ff_vaapi_encode_close() accordingly. */ - base_ctx->frame = av_frame_alloc(); - if (!base_ctx->frame) { - return AVERROR(ENOMEM); - } - - if (!avctx->hw_frames_ctx) { - av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is " - "required to associate the encoding device.\n"); - return AVERROR(EINVAL); - } - - base_ctx->input_frames_ref = av_buffer_ref(avctx->hw_frames_ctx); - if (!base_ctx->input_frames_ref) { - err = AVERROR(ENOMEM); - goto fail; - } - base_ctx->input_frames = (AVHWFramesContext*)base_ctx->input_frames_ref->data; - - base_ctx->device_ref = av_buffer_ref(base_ctx->input_frames->device_ref); - if (!base_ctx->device_ref) { - err = AVERROR(ENOMEM); - goto fail; - } - base_ctx->device = (AVHWDeviceContext*)base_ctx->device_ref->data; ctx->hwctx = base_ctx->device->hwctx; - base_ctx->tail_pkt = av_packet_alloc(); - if (!base_ctx->tail_pkt) { - err = AVERROR(ENOMEM); - goto fail; - } - err = vaapi_encode_profile_entrypoint(avctx); if (err < 0) goto fail;