From patchwork Thu Aug 3 06:01:30 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: 43104 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp1102141pzb; Wed, 2 Aug 2023 23:03:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxcIvx9+5obHwyJhmtVkevZ4tmOGMft8P9xHUmVs/bNOxFRfh+gQgS6fkcju07V0lbC9z8 X-Received: by 2002:a17:907:2e01:b0:99c:6bc6:3520 with SMTP id ig1-20020a1709072e0100b0099c6bc63520mr567212ejc.65.1691042581650; Wed, 02 Aug 2023 23:03:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691042581; cv=none; d=google.com; s=arc-20160816; b=ksCHI1dekLHRQ0oEn5iPBGq+TPwD5gjFXu+WbKxUOpfg3qXG8zJMMzbn6ICGSCzMDo JGlbyDm66Bx91A4m8vJldkt7UI0vrwNdQNCGb/o5eu0STF21EGfiix6CUh+Hb9O8wSUr 7BwS3jmqvdWWhR8rTkKX4yOkNvTnZtN4JPJXTNCtx9EnMnbS5SnsejHBArrbx5fNAVVV OaPIZRaSDEOAdxSPzlhqsfx1faDoGURVqi3eXez01sC/7zYB2YV9XsAJ0BD2DqeZE6UG p95HM6GLrUErWTJFL46Jtg80r5VTZ3CQMG2m6nA7UZRqIFHXDQ48DCdZgD3wowyLFTkP VN3g== 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=9lZxl638gbmEKPl/D77sHqznBDRy2HoRs01xiHKp4gw=; fh=W4D6CZujCwMgavJgzxxLHRZ9b2bBm3gY+ViKSXAXuN8=; b=PQx0IAVMwFq6l4Mv/rU7xZyrFz+yp2vwet5bxAZF6JjBlnl0Nmabs8ELVmDH3za05/ 5e1WO+kE7codsaM68OmAsyAByHwO0aNkEL3c9WTO1T0AD+s9BI4uZbQdP6sE0+hxw9Ep Vkh7bPlsaQVWKIV8QcfxVccg8BeacijV/4OlHA/F1tFqQ4aR5TLaKJa6nVHqR4gY8pUE ra80JRQkhZdcOGO+4m+/T4EP+474GQke7yglIM39fzXkNy+BJod3wu4Nm6CX/Dd4NHls v9onTNWnFpWJqC5qNQnBa8yC0G4kHfzMKf9E5fTZJjlyT9D51+W/jNgiaBsB3I/9dUzO bO/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=FadgYjIr; 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 qn14-20020a170907210e00b00992b63c9f9csi12017975ejb.456.2023.08.02.23.03.01; Wed, 02 Aug 2023 23:03:01 -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=FadgYjIr; 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 74EA668C684; Thu, 3 Aug 2023 09:02:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (unknown [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 875D068C67A for ; Thu, 3 Aug 2023 09:02:25 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691042551; x=1722578551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tgO/f1dgz8Ews4OpRzpzlUwkBDwwKrE8Ro0XdJkhrnE=; b=FadgYjIrE8uzBRlbfDJhaBY0ufjKBCpMQkzgOD+4jtNSbLYtueRlcAgQ KKZI5rtnvydayEDG34uuDxxPndIYOEZfek+Q28Hf+jKTvdUEynKZwMJt8 ck02jLhpZLhekNyXdhGd7IHUmkO4KN1EShP9zPsZkogFRFEfCqPyk5d9w 9+esFtzZyaQ3i0arjFuTKJPnvPNChfJ+St3zYtCIOAJjsBTgmtxMww4Qe gSxCRQ9IhGAZDu6/KFwPM7KW6Mr2XQUhcX5ZAOJaJcmTbzO7Q3VvuaDbO z3GTjWAI5wGcUBl/doyMtgNzN6hed1qUcZdnn0XhVvyk7s6tXQuH6GNgt Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="456152799" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="456152799" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 23:01:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="903224604" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="903224604" Received: from t-dg2.sh.intel.com ([10.238.200.86]) by orsmga005.jf.intel.com with ESMTP; 02 Aug 2023 23:01:50 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Aug 2023 14:01:30 +0800 Message-Id: <20230803060132.501741-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230803060132.501741-1-fei.w.wang@intel.com> References: <20230803060132.501741-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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 Cc: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BZZLmC8GgPcp From: Fei Wang 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);