From patchwork Thu Apr 18 08:59:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 48144 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1552461pzb; Thu, 18 Apr 2024 02:02:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWobjYykmtFSApMTT1d78e10gDDy81nCpQIRpKE0VaQnz9v+dJ77/9tGpI1//AeLFGBb0nvqFzIUL2bhuxhteerhzi8OXZQhI5Lbg== X-Google-Smtp-Source: AGHT+IGR+VD30IPNZxa2nDmQv3CYeJZCS6TJyUPo2GfMp/mH5BsuuYf1xHOlHMH+WiT8qEltRqgc X-Received: by 2002:a19:5f0a:0:b0:517:82af:1edd with SMTP id t10-20020a195f0a000000b0051782af1eddmr1024400lfb.5.1713430955976; Thu, 18 Apr 2024 02:02:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713430955; cv=none; d=google.com; s=arc-20160816; b=Q3vZZN+0VMXgAwXkCcLtlvFRWTyuvL3vwoWL/T9dQLxmuJatXLgWjOJ17Dn5h+J3MY BY/6xqYwK9vUfx0YCPu6HgqWW30/2tPN1KeqcgO+Tq5Ujm5Ookvy5IGLXHWz/DxYwYE4 I1MJJmQDWbBsjIlp5vxHqS/uGMZWeBDLs981+26G8rpwk4YkxHoz7XzV+XMQKv0YT2ch Cmdpafb1q3V6+aDcRkpVBa3GAlXbgDacPZbtAOJCi44f7Rtr3oxtFyGCZNF+tUKs7RES vz3GOeY5xv5bgepSZzfZQQyRaum/WLazK+RuyjSN4uWrxCNB6GuzUWgH7nnd+agCEUmB R8Aw== 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=555NNWQzvP8kovuzEvW7vhv5ckn+gQ7GyXxnTdYfsD4=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=B6a13sLjMoqhWxlD5shhf290zbCJuiayUAYDXg9T9X+AJ9t/FH9Wr2nKuzO9xiA0vk MnCQzD+xL1M1N1hr1VOO7Tq3UxiZBp61ayRjyH5wAZEg9xf78R25O2yl8mzPDSLzC5mN U3TbsB4/3T4DISRohPzhTSBH/R1t3Jf5RiL9pWrzCAzEOdniBoz9Pw75VUl29kIpXQSt hZqRAY3V/35UdTtdwrH6ZNwkE6UKrLvdToW5Gcu0RkQFH5QohzijiIyr1FdxkvCZ2Epl oZea8R4D1GWdZTbVOAsMCUyhkQgc3gvNhij/rDhEgaiJd5IrUE1qAU1D8aPl2A7m9PW9 N7dg==; 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=R4tAS0YO; 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 z17-20020a056512309100b005195c66f78fsi367304lfd.83.2024.04.18.02.02.35; Thu, 18 Apr 2024 02:02: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=R4tAS0YO; 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 76F0868D405; Thu, 18 Apr 2024 12:01:14 +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 B1CC868D43E for ; Thu, 18 Apr 2024 12:01:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713430871; x=1744966871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YAQPzkF3l+G/7PWogWeIAVd6YBAypNeMyN1ovHDVcek=; b=R4tAS0YOGVTvyXtalkG4ujeLSzh9Jlp20VChmTECfHUIOzUmI8zqCNS0 M+o2XfoLMLXMAmjMmBr3zn+1KyhB9qEZXIlsKhvp7FkI6Pco1IoHahl2H V6HAtJsySTFzgdAhNluNHu1EbKRwAr/0n/H5Hk29zzHF8mFC86gptNdsj alQy1L5Kbed8ZgmWm7Mt5nJpZIiL4v38IJ1RoPH/zRld7pCkRO/l61K41 OCbjFLbcIjWqqGv0je6Yw4GheyfipHaSgguaoznXIS/dsaBiaaApb4fLF TSXwY9cTfcXVtQgvzgSc0qfytg0p12AAO6g5K2I1pDumbw3WTDnPMUws7 g==; X-CSE-ConnectionGUID: yIp9wTHbQe2kRq7RWpVvOA== X-CSE-MsgGUID: jhh4NlIoRhGS52QlYKMbXQ== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="12748351" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="12748351" 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:01:03 -0700 X-CSE-ConnectionGUID: IEbFKELGRnGFmoFh2hfqsw== X-CSE-MsgGUID: pQWo76fxT6yFL9f8+L5T5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="54127589" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa001.fm.intel.com with ESMTP; 18 Apr 2024 02:00:54 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:59:04 +0800 Message-ID: <20240418085910.547-10-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 10/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: AY81NqPKY/S/ 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 fa954d984d..a4223d90f0 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -491,6 +491,46 @@ fail: return err; } +int ff_hw_base_encode_set_output_property(AVCodecContext *avctx, + HWBaseEncodePicture *pic, + AVPacket *pkt, int flag_no_delay) +{ + HWBaseEncodeContext *ctx = avctx->priv_data; + + if (pic->type == 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) { HWBaseEncodeContext *ctx = avctx->priv_data; diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index d822175fcf..d717f955d8 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -202,6 +202,9 @@ typedef struct HWBaseEncodeContext { AVPacket *tail_pkt; } HWBaseEncodeContext; +int ff_hw_base_encode_set_output_property(AVCodecContext *avctx, HWBaseEncodePicture *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 41d0d0f2bc..ec4cde3c37 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, - HWBaseEncodePicture *pic, - AVPacket *pkt) -{ - HWBaseEncodeContext *base_ctx = avctx->priv_data; - VAAPIEncodeContext *ctx = avctx->priv_data; - - if (pic->type == 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, (HWBaseEncodePicture*)pic, pkt_ptr); + ff_hw_base_encode_set_output_property(avctx, (HWBaseEncodePicture*)base_pic, pkt_ptr, + ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY); end: ff_refstruct_unref(&pic->output_buffer_ref);