From patchwork Fri Feb 2 10:16:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45976 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a28:b0:199:de12:6fa6 with SMTP id cj40csp840937pzb; Fri, 2 Feb 2024 02:08:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSDNQ5p0v6fD3/E2GrrGm73j+xvHjfIEBHVkwA2fCea88e+j315pEZpBeIY7J/VT9s9ktt X-Received: by 2002:a05:6402:3588:b0:55f:11cf:ee53 with SMTP id y8-20020a056402358800b0055f11cfee53mr7929955edc.31.1706868498881; Fri, 02 Feb 2024 02:08:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706868498; cv=none; d=google.com; s=arc-20160816; b=oF3RLXnhYTM9+vDAjmBXwXzUejM6hp4iYGjDbLbdHejtsMhoBErfQ1HUswWjsvEomD Wy1zsYxIK6xBAe98J4M9pB3p0Rr2uOx+fd8rVtvnPebOR7UC8wovnoIVGxVZ3H9xxskO ZDLAV54izc05Iq3A1kxK3soLZKTtqACHKyeeZpbZ8Xg3StQ2M2QhN+9BXlvm/XqhOncV UuNkoQesEj1iXrkbbjWXltEGeemq32CpBrJDQMeYigfROTPwKe2uszJvO0hNEX3ARoVR lyHYQAj54JWGZXIlFVQf49o4X0etOmuO/mtf2GuAar5q2jvJXb2UB6cgKG+uIDvM+Tg2 TJEw== 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=KZafWuYe4LtSGkF1BJbVGi3R+zLsZGzxYkfb+h6ZIHI=; fh=cZ5/MBuj4Hisk+08+Jl1VQIinL89YabnRhk2kpUf1/g=; b=LalCnd1oO18QWFVv/GQn/HKNMOzAcnIueLxut8E76sfoeUCfTaeZK1plfB4zmNRdaD VX+u+Sg061TIME726YgvdBYGMCjsAK5XM0hv/mlM2qmq9R8Sk/VnLyWpoxSCMkdDlsva iXRVhHO0yMOR4ifqOlM81b0P+ulrW8WKj7it+eK+NgdjfY2ILZ7IPiAjEQq514Hkeb90 wIPJdYhxQmUmeklHWLHatLOdO8goo3Z2AqHfH+5Yv+k2JvtklztUMviXdnNVMQheiDOr 2JErcqIQE7d+Mvb5M8Pjlq0y0MbOavs1deWm8XmNOSM+tk7Q48O97irl6JevyXVyW4Ky TQug==; 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=axk2gQwf; 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 X-Forwarded-Encrypted: i=0; AJvYcCWH8HgnmOv733lrcv4wojktBY6+vPiVDNKpnDZEZAbga6IAceDN8QV9fKEXOdmDln7lwchC7A3rcclsD5QUyLlEAcXZjTa0WK4HBnUYdbL50rJzFEiV82pEld8BHJ/ZFzUG6qBzrxOTqBnaSaTGegvSp198LwlmbiO//RkhXICbjJTHjNdlhgrWmftp4DThWzaiCvZn0/Ayhc8TjLwjOnbIlric+CI0FMz+XbfMuqG4OrCSiB5vnj3bPjxmrI5ARSTx7PQVO7Sw0bSeD/GWTmw6r/mbzeW97wOYZpihtvEhwB9FCkfV5Kx51n9gp1t6BpP9kEy62DLtqebEqn8wZwGsDv1N4fUATKCP6KhY+iJplknN3F179CNdnBUdFjtwvZyPSA69UN+U93mEK3xhW4zbj0bn0XTiubs67i3pWDJOvhfJripWHrIoW/N+6f4feXVwEntX9JEgLaobopYVHuPxKSxRebU94ogqBwQzzwNmGeu/o5BHNmZfufOhJymRq2nCRn+x4FTGv0jtOYg3gA7FQh/yBiT5jNFEswfGcnjcCbRZyLUhaB08xzhRe1dUTCPqz7Pwb/yyqj2gsU1kMN0Wki92d2+J3rDtT+f++Hy472bn4lmKW4OspYM29bedYnQRNr4ZnM82Hc45vB+DwuMV6Vx7iq8RZI9E7hWdPxSgfAhI4Eog0ok4ibtWFvJjkaQjIZBGHqswNrEyY5Kjc2tOuGZ/Rl6h8rr/lZyGl22cczoVjImClvPz9Nk7XCY2St9yBBHC50xiVbDMQ0jRxiL+NtMTZAFD38YFrfgOiSkY0j0f0RTJ0kiTfqgIP1vYLJxlKA4eVDbqunHyy4PeJOimeDZUrPVFGZdaI7STljFrDluAa0zPjNe7c9fkyel9ePlkXF5QD6EgDeRoRQ9H4QFJwXjkDnSXjVdr8A5NnlAqZYhSwTVIdianpHKdntCdVmB8hv iR2mHZ9w0dO34AcEJBzHLa1+KBPjRkze/sNaqAEYXUDBgS7ifjy5+pQC91c7y6KvDn/sYDQGhvWpog03Q/VkA70zDHhPf2xIfZttIzGO7pl9jXyLMPdxpBne97MVt15TfxmdIzAJ6qBDoikKcCpjPFYcVfi8P9kkO38/sI7cXD6MW2KlCMRTkMZUHo8Icb0LSBPit5AT0lx2NwkZPL0alzg0403N2hJAe39yiamU748g56zoqeGDna9q++APNFe6WkPEIngKynnXW0LWH0cFPy1onmGyITAhV+o+TSj3HoY6YV5/epPdPV+eTIaSOExVvTKlVzGcvb+8mBuQ1cUqcIhkBCGVsyCrrJXec4CTY/zGTOCy4SnZbMMr0RohFfLxiI/hpv/U9EJM+UzE0oqp+XDBp/tCYq4FzoNPgWomUdujmqd/T1rVhkuOWU9Xg+sb+72ueswPl6J9Ktb6F7xUKxdL9HUB9HrQT4UBg4csdINkLncBErsSZdLB/Sirv5D7/7S67dK6HmQilPiFxshvV0vsrFROStwKwecG1/eiQyrPU+IBn68mFDfcZg/gnxQF+iEcbP+e5wsRocgK6vQKoQCmYrxXjVL5252ONvBucvjfYdi2L+WMARIvPIYUc1D16FWphSyTryFrE= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z4-20020aa7cf84000000b0055ef9a173fdsi639403edx.546.2024.02.02.02.08.17; Fri, 02 Feb 2024 02:08:18 -0800 (PST) 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=axk2gQwf; 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 AFE4168D139; Fri, 2 Feb 2024 12:07:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B74868D03F for ; Fri, 2 Feb 2024 12:07:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706868475; x=1738404475; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HNp0Gt7lg/YSe5dL80mXWD59hjl8PCWweUfr/GTAorY=; b=axk2gQwfRHoL97s2lP+TVIca4o7QWnJzPK3lNQKeJ0EZKth1MX+s7/6P QIj7mGUHx6o2tmugoSJfu+SIVBXk79Tv451LH59+x9htfgmfVTXsBf0Ds 2nkWj09UXFKdTen6GEUvvCrViKBX36bAHDftmdqYqN4Jzt6zrZ6O1H7Mo yeEczQa5jOsmNE5p+hspKvpJ/SiNtZwleKFBpgUvJSz4HRtpXcB97LXKi gd/MU77Sc9m4ecOsGmD0FniQCv0jxpxANqtN4AT8qCZDIMq7yweR5HzOU 9XxFwf8mxubrFiJuV5RVQVgL9EEErCeVMNKy2/ScKEtB/mGquKLEXAvol w==; X-IronPort-AV: E=McAfee;i="6600,9927,10971"; a="33378" X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="33378" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2024 02:07:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,237,1701158400"; d="scan'208";a="4795886" Received: from media-ci-tgl2.sh.intel.com (HELO localhost.localdomain) ([10.239.47.127]) by orviesa004.jf.intel.com with ESMTP; 02 Feb 2024 02:07:46 -0800 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Feb 2024 18:16:08 +0800 Message-ID: <20240202101615.382-3-tong1.wu@intel.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20240202101615.382-1-tong1.wu@intel.com> References: <20240202101615.382-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/9] 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: bhXEE3P7Waaj 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 62adda2fc3..f0e4ef9655 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -385,6 +385,46 @@ static int hw_base_encode_clear_old(AVCodecContext *avctx) return 0; } +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; +} + static int hw_base_encode_check_frame(AVCodecContext *avctx, const AVFrame *frame) { diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h index be4c6b034e..d215d6a32b 100644 --- a/libavcodec/hw_base_encode.h +++ b/libavcodec/hw_base_encode.h @@ -237,6 +237,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_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index e2f968c36d..2d839a1202 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -668,47 +668,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; @@ -860,7 +819,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, base_pic, pkt_ptr); + ff_hw_base_encode_set_output_property(avctx, base_pic, pkt_ptr, + ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY); end: ff_refstruct_unref(&pic->output_buffer_ref);