From patchwork Mon Jul 10 07:39:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 42579 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp541054pzb; Mon, 10 Jul 2023 00:40:37 -0700 (PDT) X-Google-Smtp-Source: APBJJlFuaKnx4Y1T3MQ/kS9gODWqwzfLIwaRpIB0TxLMzmSpX3zUJHEt6YTgTaoM8IpSSK6n6pKn X-Received: by 2002:a05:6512:159a:b0:4fb:8987:734e with SMTP id bp26-20020a056512159a00b004fb8987734emr11230741lfb.68.1688974837296; Mon, 10 Jul 2023 00:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688974837; cv=none; d=google.com; s=arc-20160816; b=T5t3UWcPt5QReBdTPHUbS7g83Z2dPqnmgp6hJ9ZMgTK2RR69oJXSst43w/ZB2YjpHM LRSPcRCng5rYjs1YxDbT07UNCBl4MUzAZvaeJAMFHc2zExPV8mwUUK5dW0f1urHKbpxW Z8IkHnjRVeedfOVdWrI7xgVpLoOR9O6ch85wKKG8gmotZrFlWOFhPzgDMdDq3HRYqXaK pDz5A3mwBV9Wc0LaL9rqNFlgildl9aP3rJ6Z+xGr2/yKCrE5yY1+uWeS6Oied/DU8lPo 29lYUCxrzIYpWYHw7dNiIvmiqALyS3XcMTztVQMUxcj7Pq9DisQLtRRJMqRNt1qwYKex Sksw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=383nFbt+zEyK6HXusH5bKNfsv0yx7X4v/6BadXDbsp4=; fh=mjbWUF9Ti4XQB/BKUMmQysKKolB1ZI3Lwoj9K8X2M00=; b=MVGxgY1nedHKC1qKdcHRkTP05EJSRre/fhmQUUkOSLxBXVe4NPKhwe4WEKWIjw0jmN ZaXGoPJAYEBIfbwHURyqI1DTMhtqleWEq9xHTFSUeBv33Q50zDOF2dPx/tz/PC6xz03T v3nX6iP1gae3cA3reoKW5TBzgSM7T8KnFnH79Bi8Ze3VXduEyCEwqquLl0AYFfLC5Nqf P2wM1SZTWA8+kg9kYp6M0QVrg3+dLEJdxHBruxsAVI0pMNeXoh7ftPsDG7FsWOblRSrC l+Exv89QzkvC47gS4pSkpK0g+wL1hLJ/N2zAPBRtN4d52z1/X/dx/q2cpgjMsAUJXuQ4 pVqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=I2IfoVeo; 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 e21-20020a17090681d500b00988ccf32c61si7950372ejx.40.2023.07.10.00.40.36; Mon, 10 Jul 2023 00:40:37 -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=I2IfoVeo; 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 7896F68C4F3; Mon, 10 Jul 2023 10:40:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 547DC68C4C1 for ; Mon, 10 Jul 2023 10:40:05 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688974810; x=1720510810; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=G22WmdvgKx7SROv6rBXnZoQIngi8Vo/aGDpbq08X8T0=; b=I2IfoVeo3uD7FxEkV6sFLb3KQzCIhhWT3BgZ/u9D175Tg80AFo3NXN+Q 1YZkZtS6ZGRyNGit/LImfWwDjw+R+/g8oOslYK0qXC5d1mi+4b/ju6sd3 I+6CJeEvONiLjempJTd/jQso4X2XiK+GpySd+qZigGrIHz1x75AxnP6eU 97nonkuX40vSybL0PYQfooicMz+yBl8e+bPjiAPaYDZzJL/FanJvyaSjQ 9rh6O1z2Kp8HMREVFxl1Kd6Cp6JTXeWZV0w+VywutKUcp4ikzdUO5/DXw EKXnUNZYZgOU2fygrXdus52LxtQmkR5tWz4Ij1yq+7dWwz6UgPxRe+8gl g==; X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="430350947" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="430350947" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 00:39:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="720611007" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="720611007" Received: from t-dg2.sh.intel.com ([10.238.200.63]) by orsmga002.jf.intel.com with ESMTP; 10 Jul 2023 00:39:58 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2023 15:39:39 +0800 Message-Id: <20230710073941.425658-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230710073941.425658-1-fei.w.wang@intel.com> References: <20230710073941.425658-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 4/6] lavc/vaapi_encode: Extract set output pkt timestamp function 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xZWTephL3dAN Signed-off-by: Fei Wang --- libavcodec/vaapi_encode.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 8c9f14df66..c8545cd8db 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -650,6 +650,27 @@ fail_at_end: return err; } +static int vaapi_encode_set_output_timestamp(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + AVPacket *pkt) +{ + VAAPIEncodeContext *ctx = avctx->priv_data; + + 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 vaapi_encode_output(AVCodecContext *avctx, VAAPIEncodePicture *pic, AVPacket *pkt) { @@ -1273,19 +1294,9 @@ int ff_vaapi_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt) return err; } - 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)]; - } - av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64" dts %"PRId64".\n", - pkt->pts, pkt->dts); + vaapi_encode_set_output_timestamp(avctx, pic, pkt); + av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts %"PRId64", " + "size %u bytes.\n", pkt->pts, pkt->dts, pkt->size); ctx->output_order = pic->encode_order; vaapi_encode_clear_old(avctx);