From patchwork Sat May 25 10:30:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 49241 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2239681vqf; Sat, 25 May 2024 03:33:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjW0cxWPy6pLKXQvdByvVfGVlAQcmYKl4Rtubd42RjyaMk0OCWDpLyZRqzwvXkoh2tzIkiN+fi/SeI+srzG41PFVdbHBt8ngZE4A== X-Google-Smtp-Source: AGHT+IHUeXYch+LYoX9M7z9nqkklFGgbjMoo8uEfUmW1fzoTLER3yczMV1GSYefpO/NlTn7+hY1K X-Received: by 2002:a17:907:bb84:b0:a5a:84c8:770b with SMTP id a640c23a62f3a-a62643ec955mr287869266b.36.1716633200563; Sat, 25 May 2024 03:33:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716633200; cv=none; d=google.com; s=arc-20160816; b=YsbdkytZPm/z1nE2S7FDzAHaQHEmPXdyebkVnyd0JKGGNewwiSgfBaoc5SGoOvJ5GV El6RJCSGi+mUs0PdKcxSlkq2/LkmtGogsACT/rUgBT2RHS24bLJEMvtelLtnhHXnlgKb cRosUdeB7St8XkBlnziDSvMql2Dk5A9gAH+zjv6jQYkG/GZ3H01ex9C1g/8opWNBglK0 7okgz6lStb8bdKWJQiugOe5MtDfcvWzWhZ59x88ympX0DEs6bx9c/Ul49Jc48KDCbvXD 0ul5NTPniw4fSyPG4AHRxWSvOP3QNcLxjFoCl5oY0hpZdwz8zzd0yHnpBXpDy+P6Vyvx 93xw== 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=IsJmvzSFuLxqPID5kZwbqlEGKFc/2zoVq3zpYIgo1gUEj5mKQJBVbRh7pgBZ5A/fuI sKVzCekXixepi89rV2D9mWvB/mgXsTUCM/GognjweIIVZ5Fc19OA6jLnlHXfiyXj2tvj J7frBaKWt/u4W9IRWuSN1dTpR9eQdHDJYGNnTqiW8csrfYw1J26nc2+heA4BFe0Xv5GM r7efeGwYK5qA/eG5ggIbhJYglYKAycGciGOgBN3kkFl22fYvS+MmO6HcNdRw6g9o5QyI Rvi+EaWqAYo7w5FFu/ZD/w1wHq0t2c11rUquZgeH3ormXphlpIxwioHbBrZwfcVX0jtj 0uEg==; 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=kZnIbRxL; 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-a626cdd302fsi177618966b.1008.2024.05.25.03.33.20; Sat, 25 May 2024 03:33:20 -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=kZnIbRxL; 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 1FE3368D5A1; Sat, 25 May 2024 13:32: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.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4181768D58E for ; Sat, 25 May 2024 13:32: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=1716633136; x=1748169136; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kAugwS+vEoWg5vemeWk9mHJhM498n/k62qmPXAi6Hr8=; b=kZnIbRxL50a7eOv+YEVXhozMK6KRVuv1PW5e5PDQ1lzArT+UVgp2TsRx rRnLenl1RbY0vsnWTdtHxVjF6Z0OxOEKBeY9PJOGcaz2ClO2fGJunF7NO hsoHiyMSFSbb1ANFM34/evmRpyFqzHY/LdObySCdXmsZDNGcsi8n+XA3p 1hAzOBYGkn9aMzgHFpbmE6ou3qiG3O1TjdyyLgYuMtttx3P8l4Nz1Krzz pD2Ct6JhoLN3Pch0N653GXFxyR/J8GEIktj9KBe7gHirFdbw8zpuepdT3 Cf1ohYhv9e50LTNEOjU+b6hyabgbYPFTy2WnWmze8N6CqJXYxK8ovyljx A==; X-CSE-ConnectionGUID: Xo41FJsERbCNSjctyFFB3A== X-CSE-MsgGUID: vZ9wqEBQS1uMT0JFC7B/MQ== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="38391104" X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="38391104" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2024 03:32:07 -0700 X-CSE-ConnectionGUID: QjpeToEsQZCMtreg+HiM6g== X-CSE-MsgGUID: cS2bgCZ3RFCaqxR053Dgjw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,188,1712646000"; d="scan'208";a="39252420" Received: from unknown (HELO localhost.localdomain) ([10.239.160.66]) by orviesa004.jf.intel.com with ESMTP; 25 May 2024 03:32:07 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 May 2024 18:30:16 +0800 Message-ID: <20240525103022.1390-9-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20240525103022.1390-1-tong1.wu@intel.com> References: <20240525103022.1390-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 09/14] 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: +P7CzZwaPyLs 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);