From patchwork Tue May 28 15:48:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp54512vqu; Tue, 28 May 2024 08:51:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWe3MxFQy19w+ef3xTndXZEfNNam+p/U+FKZw/2//oj7huJwRqdDe/CQARePyqtsSlBfKmdPjURHptAaviw1//hIG+FMp5B7SME+g== X-Google-Smtp-Source: AGHT+IEt9rjUlbMY+D9zyepveS2uS4B/F5p1dLNs8v8YW9WBGMHiDNrWCpnhjoEb3TqB8hwPr0Hi X-Received: by 2002:a17:907:76d6:b0:a63:3c57:5806 with SMTP id a640c23a62f3a-a633c575ccbmr169051066b.32.1716911484716; Tue, 28 May 2024 08:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716911484; cv=none; d=google.com; s=arc-20160816; b=yzczrKT/4r9iqnwsYNesG52yNagmLHAEtsw3mTqluuqc45QFkn2w8Rc88M1Zl6Ziqv C3OshxcsjDYnK8TJBHMhZS3OL520ygaeWfDpv7VwdJLq1jKCamuSRdnYlJi/DgyBXGE3 IKBU7KFocsYJuo3GDaeCgYm1PiMdMZZ8zfeoLoq5cNNL0HHv6/FXAUw7ibscKVVZQGgY TkjF/6TTz6QF6AZgtsrwuSv9sK1IaMvFQWuFklswJTkFyKmJFFrpQr6pFGILEUjuH2r7 +VDHDIhjRttuKNDfNxtxmll1vEqDSpla9asOKDkLCRGJKyY/RAOw4GQfBqXtEcbSPJZh Jb8Q== 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=uXb3O7w5acGKwowr+0GutHEvlHuTtXbbLVyyJPUyzJ8=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=aoKjJ6GI3hgSqyiCdISQHMntnaiaZnV1GrndHxtecLwEe1uUlx2yg92aODg695TsML jjIQBdnyc7GZ3RW2ORrWgBRMQZn+Xpv/sDr81HojjTtJVBx9kcQuhHMmnDiU/VxfDZyX MPy7fZ4fqJF3UuvlrxhW+FyMYn4eKBO77yGgre51o7iELLdmo2u1jovDlGBY4pSF9ETn iIZwI3m8THfZAZ2SP/ulyXeEZ9ALikzbEjkaDXbfU9cZOTS6KlISd9/wNYnvO4QT6//X i6AV3jb/p/d7+iV2Vw4nLTxeHlgj9uBoYUG5wAoyCwv9FEp7nvNjFdbAloUYmwDbczut UkGg==; 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=m0QHRO4m; 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-a626cc38489si510735266b.471.2024.05.28.08.51.21; Tue, 28 May 2024 08:51:24 -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=m0QHRO4m; 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 0577A68D565; Tue, 28 May 2024 18:50:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F058468D53A for ; Tue, 28 May 2024 18:50:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716911405; x=1748447405; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kAugwS+vEoWg5vemeWk9mHJhM498n/k62qmPXAi6Hr8=; b=m0QHRO4mpO+IVlNfj5ls7yGWjptiIZ5sRqwhq3KOrcgIUkBX+I9qvcpC bV2GTU6FIhZjXvIiBFwj+crpyhFNcHOoUMg7tj1yY1QWPBvWg9NC1kvrl rz3T9Wds2gctjNneii3ez2goFHL9Yku2xcZZTiP6suBUVbsJNEiykkLf6 y7M52sCatbKY+uUTq7/ala4H1IyIRYWE2P7uF11vOpQ4pKDOkbtMX0a+f ZB0LoTPb4U+gyP0+uErgcrzixmbMn+3ec7KjfME00/zoIFPi4Ljf9cX+k auihG9a4+ppItzRmg83GoVOZmKVVOehfq+obchKP9b/Q384sqRlBer0aV w==; X-CSE-ConnectionGUID: Bk7CTxdoS6epB5nB4f8wDw== X-CSE-MsgGUID: ZiGJAOeaQt+XFVSuQY4Ejw== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="23821906" X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="23821906" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 08:49:58 -0700 X-CSE-ConnectionGUID: KCXRjUsrR/ieGhFdwCyjOg== X-CSE-MsgGUID: yia46Zc6Qp+LrfDewehWdA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,195,1712646000"; d="scan'208";a="35731100" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 28 May 2024 08:49:57 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 23:48:00 +0800 Message-ID: <20240528154807.1151-9-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240528154807.1151-1-tong1.wu@intel.com> References: <20240528154807.1151-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 09/15] avcodec/vaapi_encode: extract set_output_property 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: Dm68CFRq2ain From: Tong Wu Signed-off-by: Tong Wu --- libavcodec/hw_base_encode.c | 40 +++++++++++++++++++++++++++++++++ libavcodec/hw_base_encode.h | 3 +++ libavcodec/vaapi_encode.c | 44 ++----------------------------------- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index 56dc015e2e..25fcfdbb5e 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -488,6 +488,46 @@ fail: return err; } +int ff_hw_base_encode_set_output_property(AVCodecContext *avctx, + FFHWBaseEncodePicture *pic, + AVPacket *pkt, int flag_no_delay) +{ + FFHWBaseEncodeContext *ctx = avctx->priv_data; + + if (pic->type == FF_HW_PICTURE_TYPE_IDR) + pkt->flags |= AV_PKT_FLAG_KEY; + + pkt->pts = pic->pts; + pkt->duration = pic->duration; + + // for no-delay encoders this is handled in generic codec + if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && + avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + pkt->opaque = pic->opaque; + pkt->opaque_ref = pic->opaque_ref; + pic->opaque_ref = NULL; + } + + if (flag_no_delay) { + pkt->dts = pkt->pts; + return 0; + } + + if (ctx->output_delay == 0) { + pkt->dts = pkt->pts; + } else if (pic->encode_order < ctx->decode_delay) { + if (ctx->ts_ring[pic->encode_order] < INT64_MIN + ctx->dts_pts_diff) + pkt->dts = INT64_MIN; + else + pkt->dts = ctx->ts_ring[pic->encode_order] - ctx->dts_pts_diff; + } else { + pkt->dts = ctx->ts_ring[(pic->encode_order - ctx->decode_delay) % + (3 * ctx->output_delay + ctx->async_depth)]; + } + + return 0; +} + int ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) { FFHWBaseEncodeContext *ctx = avctx->priv_data; diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index c7e535d35d..f097d826a7 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -204,6 +204,9 @@ typedef struct FFHWBaseEncodeContext { AVPacket *tail_pkt; } FFHWBaseEncodeContext; +int ff_hw_base_encode_set_output_property(AVCodecContext *avctx, FFHWBaseEncodePicture *pic, + AVPacket *pkt, int flag_no_delay); + int ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t ref_l0, uint32_t ref_l1, diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index c29493e2c8..4193f3838f 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -660,47 +660,6 @@ fail_at_end: return err; } -static int vaapi_encode_set_output_property(AVCodecContext *avctx, - FFHWBaseEncodePicture *pic, - AVPacket *pkt) -{ - FFHWBaseEncodeContext *base_ctx = avctx->priv_data; - VAAPIEncodeContext *ctx = avctx->priv_data; - - if (pic->type == FF_HW_PICTURE_TYPE_IDR) - pkt->flags |= AV_PKT_FLAG_KEY; - - pkt->pts = pic->pts; - pkt->duration = pic->duration; - - // for no-delay encoders this is handled in generic codec - if (avctx->codec->capabilities & AV_CODEC_CAP_DELAY && - avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { - pkt->opaque = pic->opaque; - pkt->opaque_ref = pic->opaque_ref; - pic->opaque_ref = NULL; - } - - if (ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY) { - pkt->dts = pkt->pts; - return 0; - } - - if (base_ctx->output_delay == 0) { - pkt->dts = pkt->pts; - } else if (pic->encode_order < base_ctx->decode_delay) { - if (base_ctx->ts_ring[pic->encode_order] < INT64_MIN + base_ctx->dts_pts_diff) - pkt->dts = INT64_MIN; - else - pkt->dts = base_ctx->ts_ring[pic->encode_order] - base_ctx->dts_pts_diff; - } else { - pkt->dts = base_ctx->ts_ring[(pic->encode_order - base_ctx->decode_delay) % - (3 * base_ctx->output_delay + base_ctx->async_depth)]; - } - - return 0; -} - static int vaapi_encode_get_coded_buffer_size(AVCodecContext *avctx, VABufferID buf_id) { VAAPIEncodeContext *ctx = avctx->priv_data; @@ -852,7 +811,8 @@ static int vaapi_encode_output(AVCodecContext *avctx, av_log(avctx, AV_LOG_DEBUG, "Output read for pic %"PRId64"/%"PRId64".\n", base_pic->display_order, base_pic->encode_order); - vaapi_encode_set_output_property(avctx, (FFHWBaseEncodePicture*)pic, pkt_ptr); + ff_hw_base_encode_set_output_property(avctx, (FFHWBaseEncodePicture*)base_pic, pkt_ptr, + ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY); end: ff_refstruct_unref(&pic->output_buffer_ref);