From patchwork Tue Jul 18 03:12:01 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: 42794 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp220706pzb; Mon, 17 Jul 2023 20:13:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlGMoUjeyvmCEuvzhNg0Qo2Ka3Y7296/+wEGxiyh28XheC/SiGN3luwCVd8s9d6aH+ID5Aqs X-Received: by 2002:a05:6402:499:b0:51e:1c5c:b97f with SMTP id k25-20020a056402049900b0051e1c5cb97fmr14542138edv.2.1689649984646; Mon, 17 Jul 2023 20:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689649984; cv=none; d=google.com; s=arc-20160816; b=Jlof2uOber6tXt3Ucy6IXA3i5TR0U3R7KP06SWAj8uEabZ924MUHLAdUMn8MgSy0+T 3OlkvpnPVfmshW1Ox73J1o24QPuqg72c1/rgwskm1tnbJXqGzQGfzdi11ejqpUUctdhh 91l1pcuJ4Q/xKP+JXoKlb3YPtk0XnsRZxihAUV4i1VN/Ya3wQVYFT9TL9DqSCChEoK7G I04GieTKQ23Eq+3GpAUHHB0W5gojaEpmeV/HokmRdh5h2RzRAVSicOtMX5VxE9G0q5iT DvnyTX8fIQ5kPSUxuSHHx+ppdNtvWgqbPw7ow+qzJzHJK6W9jGMPFGYaUIDzIID/D1zx XpoA== 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=fcvVsONSHOj9aAS4vKEX6IkFUSjQ7poANh5RwTodp09X6XWDFTKP/QMDvxsqIKaolZ 2wR2Uis1/ekxQZFAVJIMXrm4pimJFHl4zG0IeLloPj+ZbUyc3P3xXpU4Rmw9rmEyTOFs RLwmQZH4ihSGKeqfFPGB4gkfddfc1ovPGqDn1+jiGrxQhBqehJ6OJNoPsPrJgYzkht5r 7ukPQUqaMGeDQdA4TvBFJqU4zs+OZuOeRrIr0WFGw1Yt5YqK0nbGLXiUUtZ6eVGZjaK1 JQ6Le4PGcQbIMAwLe3gIq5gimoiZG3BH3rFB2XxNt0wIqAKQcXkHuoRFLLcxu7mePNyH TkvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="C/lOXt4d"; 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 y22-20020a056402135600b0051e052dbb30si513629edw.608.2023.07.17.20.13.04; Mon, 17 Jul 2023 20:13:04 -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="C/lOXt4d"; 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 ACDA268C30F; Tue, 18 Jul 2023 06:12:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A5A168C1CC for ; Tue, 18 Jul 2023 06:12:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689649954; x=1721185954; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=G22WmdvgKx7SROv6rBXnZoQIngi8Vo/aGDpbq08X8T0=; b=C/lOXt4dJBV2erhgYHeo1cwfErPfGyfML8emtwCZmIDBuly3EROBARhB oiXdN3Pd0D0lB26zdJwvtd9YrEGh0jlaUc2Z0d0TLnObog+ejJfCTjQGe XwIQig7Nd38NI6+NXci4o5XLI9yl2bmpqmxWnSuqKSELvMKIvS7eVQSs3 ruZ/bB0xgkeCMpGpon658XiafpqN30mKtorCVT7Mk96aQ7c9AsBbqvMR1 8vMtE+rvbXzQsqghtRy2/X8AAnCiiTbWnKu+g5NxIyolfzQc4F8dgMSF/ TZ1qpjc9v3JqUGBZGZAU3CU40GcZJZ/Pd8mET2eNzJicYerfNQ7TY12HH A==; X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="366133482" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="366133482" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 20:12:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="758646245" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="758646245" Received: from t-dg2.sh.intel.com ([10.238.200.63]) by orsmga001.jf.intel.com with ESMTP; 17 Jul 2023 20:12:22 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jul 2023 11:12:01 +0800 Message-Id: <20230718031203.87803-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230718031203.87803-1-fei.w.wang@intel.com> References: <20230718031203.87803-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: gsYY7gP5R4IZ 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);