From patchwork Mon May 20 14:52:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp4514408pzb; Mon, 20 May 2024 07:55:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5ctkGWg4u0x+eEMptHPyqtidwnAUK8F1O1FZyy/WbsXHFsQ6dcKLNtNkfEHRXwKqbLCbjA+2PnJ14K+uDQnntVBzf+ewdw3MHYA== X-Google-Smtp-Source: AGHT+IG2nzbSKUJ43jCpkSoWV2QLuVF+yCdrlTyWbPbiyj52bq0Zutakf/h75CiO6NO4lQZAZSbc X-Received: by 2002:a17:907:3208:b0:a59:c367:560c with SMTP id a640c23a62f3a-a5a2d665e1emr2121266166b.60.1716216910670; Mon, 20 May 2024 07:55:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716216910; cv=none; d=google.com; s=arc-20160816; b=O5Bv/+D6TPv0gb44I8qMJ+KLgrO3ISuEYCDq5iV4Dz2zgW1ldRHwSYA1eSCE3n1tm4 9c3qZrGjuLn+ZtzT/N88k1FBFy++q3O2pWvqpe+smhauclsy8yjwMKMOJzI80W4elEQ6 KN/mpt1YZWf3I0/MPfaaeCok11gDJGZ9bbNwrOv/eIhGlHXWaeI+ezkSYnjbH/sXTdM7 b9ksWkByekFBgmllx7+yXPLVQAaypEF77kxkNNAuwFXptemKB0JgMwuaX2KY72BoM/vv GdF01S+X878G4+EBogUwk8QOiyl26r5Jx8bAhHJ184+5Q5FUbqL+qtbnz7+Nn6MwDc5p Q9aw== 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=1QmX/9xo4/hc8pm9VjpzI+I+H3vm2NTPpDWCyb9mwzA=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=ZTtjsf0+l1TRONwS5+yx7VMsxp4Q6Iv4aYGJzt/e4P7uj5m3Gf8KqlUsSEkKt6pZX5 M2e/4w44b6hbwJz1i5jyajVAc0GOAspboozaZ47afH0FXngCdeWdfpUKNqUT/eEqeU40 u/yQEcKc6b4YuE2ztK5jruNIylxEWNgI8JxVmKYcashxNOVSKWBhmeb4AAbksfzx/wvP pTm9jz9gVG4EZTpHxKrll5M0RSO6LaE33opBsOzb1K28YSOkrS730i/yWzs2UNAQh4oA YhjCMp+F8q7ibT0g4cvzefA/i57/8jAoSU0KUg0sHRV6i/XtmEzyXNobERQqn/Pa6yuL eIOw==; 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="HaaCKr+/"; 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-a5cdc6fd9f2si555993166b.546.2024.05.20.07.55.10; Mon, 20 May 2024 07:55:10 -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="HaaCKr+/"; 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 A85E068D2AB; Mon, 20 May 2024 17:54:15 +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.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F305168D1A3 for ; Mon, 20 May 2024 17:54:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716216852; x=1747752852; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ILKhRkw+7e2FkdCBOJoN+eocfS2wScMEDAqCDKDZeAc=; b=HaaCKr+/VHkGh4p6emY960tn0t0U5Aj7a/a/m+Auq5lh0afBsUGpKzmp i28E4439Qr8ShlwG4YxkBFeAiQTUhrDP2XzyWBzt6Einh14B1QoG0Wjze qJMLjJN8zTnztxRZv159YPEO6oCSv/v9JS4FBX3ufflhSveKSSZ+JibC4 OMvSh8mhTzcLFxQdWhuICzstFzi/kJiyowVUH398gZwvP0/mqEJwIi0AN cccs0y0uwwY/9IRlCCPAUjNHs1e9gxbjdRFWktjeV5tYx0+flo8JTclUR imHfwdfNIXzHXCsv321gkM1yA3FnK7rtlh04GVLtfZcT6DvjvigO2TaNA g==; X-CSE-ConnectionGUID: mLSa18u/QGKlK0QtnaKB1w== X-CSE-MsgGUID: HHwAJiVlS2Ow5cG6IVZsNQ== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12197252" X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="12197252" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 07:54:03 -0700 X-CSE-ConnectionGUID: Nb60mRYiT42CEIqgh9jjDw== X-CSE-MsgGUID: IODEUqY3SZajV9iLrjf61Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="55787895" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by fmviesa002.fm.intel.com with ESMTP; 20 May 2024 07:54:02 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 May 2024 22:52:17 +0800 Message-ID: <20240520145222.291-8-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240520145222.291-1-tong1.wu@intel.com> References: <20240520145222.291-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 08/13] 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: M0TcIQEQy3PP 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 dfe20c4e67..df820c2f83 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 07936bf9bb..d363819329 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -203,6 +203,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 4db64b686b..6ab1b633ed 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);