From patchwork Wed May 22 01:26:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9214:b0:1af:fc2d:ff5a with SMTP id tl20csp81983pzb; Tue, 21 May 2024 18:28:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUYbkGDWIORhuMXOjdMAoq/Uo7+h870/kv821SIh4iWlbTX4ykwEHSII2o28l0xq4YyePAwOQp9FiZbzR8FdmaVAMsG9OXiUBNqHA== X-Google-Smtp-Source: AGHT+IGw2O+XALQ8Gi077sENrUKzLk0XFwclfUlcsFn4LgYrEEfG+SD61xOKDQ52TZUKuEEfsbUU X-Received: by 2002:a19:4301:0:b0:523:54a2:3836 with SMTP id 2adb3069b0e04-526bf738461mr224651e87.33.1716341339356; Tue, 21 May 2024 18:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716341339; cv=none; d=google.com; s=arc-20160816; b=uoBAB0RlQFlmXq9U51KJKxKt1uDafFsfyMoc5gCulYeftcF3mTS+hKq7KExjkSs9Fp ot+Qq2+R6/Zmje5OKmfFxPhw2Q2q/th4dH55/YtR2OLloeIOrhth8DyMMBjvcRL/XfyW mYfdHSUg1HjbJ09uFUY9wtoG2qmqq5vzI5RoEw/bdpfi+vNsJsaQe7LzWUpNWAHSXcgj VuXGtbQotbj58ti8AMrJdQYAhA4ijaiimKRB/EqqFEQ9vwmYiU8SybGP3rb4xAtdoQyQ 9mtWHg2GwVjBt0V/CW8ziyEkhyvlKTt34dd3IZOeHRW7UBZ0LQ7XG8J3zPece9UgE/gm UUSg== 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=UrrcN3Neb+CCtJ9BTJl1KrhRs4E9S8ZH8CQy0OxinyjjaPyQpLlm4SKBLXnDjj/nBt y/uD9EE5AB7tTprNAm5y80LYIEFZo2H4F+dIxvjDoxcdhOX4gva5K/Hwnz9wwT1uMtZD 1+LNFrfrs4+uhxZBFI6bjL+9JZg1JIHkRl3jDQKAF7vGeLGy7AAZl1RLpvryTgq7rErk pkcq3ctMtOxzuvZJmrwdmIRLCfAWH/ClTQ55njfWOaI1hBGFDYhbVZvm5wah+CrtVLD8 u3cM//czBPs5JXj/W7hLdX6acCOld0dpInBQtHMQT3eYBUGVZHjd13/PGEDpYNGuAC05 +tWQ==; 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=nX60xzfa; 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-a5a2e6518d3si1364133666b.986.2024.05.21.18.28.58; Tue, 21 May 2024 18:28:59 -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=nX60xzfa; 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 2735268D446; Wed, 22 May 2024 04:28:20 +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.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAB1E68D41C for ; Wed, 22 May 2024 04:28:15 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716341296; x=1747877296; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ILKhRkw+7e2FkdCBOJoN+eocfS2wScMEDAqCDKDZeAc=; b=nX60xzfaCO7eEr6uZVSW1/zet/vzNIbkcumf/5s7Bgz19g011Q/2SNAM 08HmfVk9Xwyejh54qmlJjgSVbJnylajDnt3l117E6H/8RpJEka2Aio1wE vGNF0pRk7ObPb3rd/jPLvNkkT/idXcvHXbjr8guCGJgFBeMgdjParwC6i ieGBaFcR4yr30d6UF6/q+n8o/Xfn8+HxafGbtS2i8NlYyZcSBHGBWROPF 81vjdKWrZhZ+DdPmIvLG7tUBqz+OPj5vYfpqI96XKVMeukUY2gy36vN47 DLeUQdaC7vMwVlInNFatpuFmH2SsXCdRnRPYOjtfSnOk953f3ZWfaQm+3 w==; X-CSE-ConnectionGUID: MdHA9kLtTemiTkELxdUbLw== X-CSE-MsgGUID: gUVu3ad2Su6ZlajNDSc10g== X-IronPort-AV: E=McAfee;i="6600,9927,11079"; a="12797211" X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="12797211" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2024 18:28:09 -0700 X-CSE-ConnectionGUID: QjdT/VF9RrmOHzey3tthXQ== X-CSE-MsgGUID: AeXHEV6MR+a/4W63X4lRQQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,179,1712646000"; d="scan'208";a="33537492" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa006.jf.intel.com with ESMTP; 21 May 2024 18:28:08 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 May 2024 09:26:21 +0800 Message-ID: <20240522012627.1386-8-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240522012627.1386-1-tong1.wu@intel.com> References: <20240522012627.1386-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: g9LXei/0/VtS 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);