From patchwork Thu Aug 31 07:21:04 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: 43408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:299e:b0:149:dfde:5c0a with SMTP id f30csp76204pzh; Thu, 31 Aug 2023 00:22:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmju0Wd2mvKNpc729vZiyLVfudL569xTXxL5kLV9zypAoxwIE6ppjyozUq9vZmDxnS7jwH X-Received: by 2002:a05:6512:220f:b0:4fb:9fa7:dcda with SMTP id h15-20020a056512220f00b004fb9fa7dcdamr3752896lfu.26.1693466546489; Thu, 31 Aug 2023 00:22:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693466546; cv=none; d=google.com; s=arc-20160816; b=bZozOJTTXDK5cMq39v4zQKz7wel8NBIfUMlgpMxr19UuGIEk+XwGTSWlN/fCEZVTz0 zl87VJcWAVk1XbvHdEDx3SiU8Lg1dpDgx1W9jAZtwcEk16LhCKMp7fDrLQqc9r3PdMMZ Ruz8IoS18EKxr5KJSZLKGWxz6wh87aHloGXqZRsncFi8/OXztDvJyHOYCU3xWPSNunMV k9NATxD+gqOyd6th88irUHzVWHTLcSja8JDYSuVXfhMC2G6IYAlY73UmLPXg7uXor7jh t+sMAXiSKE7YAmMdGWeU0oQXsyAoMGnK7EfPdJXo94tR5+c6KOOE2GYP7nbcdHnA0TfM xL+A== 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=7zzMJeyJFL4x/BrjBXdNRhcUVVignZPebOpoxJXAoF8=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=BqEVI5bn/dR6qHt2Q8sBZGb1aqX4hAb5JlgsUX6jIwuupe8qmaebf3SJ/gG6VdVrF8 CcR0ZPOhq+CkpUKbf/zphGrKRSXVLSxSgCeVN2Lg8rno0YOo5gMYFnZIZTI7jrhEkqKk gJ34Vg58Hqtf07HQDvb7UeKsBaDEh28foWzX9ZFtaDbsKFGawuBOdZxrwANR0vKAeLad tuK+PhhasIjoHniRfIzfi8fzxbL0L5PlCl64yCCvQVMxvdtFaAziorAi1YCcFaCzDQhV Jz66XsNDjmC2vOIYEQanQJvbXxWRF/RB6AdrJB7hL3IjDaL1CQI6xsufkLbRL5x/pj7C moWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=QZ6SQ+y3; 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 u24-20020aa7d898000000b0052559f0e905si668248edq.91.2023.08.31.00.22.26; Thu, 31 Aug 2023 00:22:26 -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=QZ6SQ+y3; 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 7FDB868C75A; Thu, 31 Aug 2023 10:21:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0677B68C613 for ; Thu, 31 Aug 2023 10:21:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1693466512; x=1725002512; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VJM6KXWKUp3cy9+2+/GK7PV+irs50hQSduxUTi81IVM=; b=QZ6SQ+y3CAZEYMciBFXM1UD5LxC+2Qd1ty7FawQeTirS2LLsauqzzDzs lD8I/EY0rkExJDHwun57pwZyJkcpHV+PctCnwRcPjVi0hZn6rfbF2psmI +4wHsck+fI+U9IQPXpnpGMdzLxqKrd1VsZX6A9KZwcQNMeI2Xby8PK6z7 cKJAMdi2CViBD9UsAJqbolCSL4N+q+4R7B1969qDcy04F99LbYWn42AH3 rC5X1/ZXhecv/lNlKZ9qZkpD22i8oakdU9ACCfMlSLq9fRzObesU5wo+T 94ca8Sje05s2jXGA5vdZUrJIbsjFGpd5V/PFeI2o+g+dbD2tEtUrYUAom A==; X-IronPort-AV: E=McAfee;i="6600,9927,10818"; a="355344950" X-IronPort-AV: E=Sophos;i="6.02,216,1688454000"; d="scan'208";a="355344950" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Aug 2023 00:21:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10818"; a="854045397" X-IronPort-AV: E=Sophos;i="6.02,216,1688454000"; d="scan'208";a="854045397" Received: from t-dg2.sh.intel.com ([10.239.159.29]) by fmsmga002.fm.intel.com with ESMTP; 31 Aug 2023 00:21:22 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Aug 2023 15:21:04 +0800 Message-Id: <20230831072107.1051955-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230831072107.1051955-1-fei.w.wang@intel.com> References: <20230831072107.1051955-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 5/8] lavc/vaapi_encode: Extract set output pkt property 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: 1uAqyKGDlJwZ From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/vaapi_encode.c | 65 +++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 8c9f14df66..719daedbc9 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -650,6 +650,41 @@ fail_at_end: return err; } +static int vaapi_encode_set_output_property(AVCodecContext *avctx, + VAAPIEncodePicture *pic, + AVPacket *pkt) +{ + 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->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) { @@ -691,12 +726,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, ptr += buf->size; } - if (pic->type == PICTURE_TYPE_IDR) - pkt->flags |= AV_PKT_FLAG_KEY; - - pkt->pts = pic->pts; - pkt->duration = pic->duration; - vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: " @@ -705,14 +734,6 @@ static int vaapi_encode_output(AVCodecContext *avctx, goto fail; } - // 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; - } - av_buffer_unref(&pic->output_buffer_ref); pic->output_buffer = VA_INVALID_ID; @@ -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_property(avctx, pic, pkt); + av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts %"PRId64", " + "size %d bytes.\n", pkt->pts, pkt->dts, pkt->size); ctx->output_order = pic->encode_order; vaapi_encode_clear_old(avctx);