From patchwork Sun Jul 26 11:41:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21265 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id D9EA144A8B1 for ; Sun, 26 Jul 2020 14:48:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF46868B50F; Sun, 26 Jul 2020 14:48:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 037FC689BB1 for ; Sun, 26 Jul 2020 14:47:58 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id p14so11278476wmg.1 for ; Sun, 26 Jul 2020 04:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V45BQsGUnmbLOvL9mY4alB1DWf59rgwbXHca55HK0fw=; b=qeYeJL2XFE5MKOSu6IBn2NtHzDaGoMRZC/YWNsdOwusGR8BOuLc0LNhPQeG4vLmio0 BEy+mkgSBSymVAN2E3jgMRN+IDf7NoYc6oIt0wyhO1fE9eo2ri1ZiUMY+wkhI6ilHftV JEvB0gl/LWQBcC3Ut5iNpOkJUDl83dlvKAUZY7IGg0O0ol390i/KtKFw+zdfln172dC5 PDGvOgVWJ7dGM7Lr/FThhNRtbmMy2YhYspG6ygJca0Wpq9JQZG1/pMGMTNajjtmA7vuj JvLEr7tTcDNZWTcU2UyjHF6k5s4+H4B9QUTX7Q0zmH4+i6JEzp1y4aMYvoHNEs/OM5Wx AsOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=V45BQsGUnmbLOvL9mY4alB1DWf59rgwbXHca55HK0fw=; b=uIEZByPFJRck+9FAuSL1Xf88vWTt5LjGAWXqh+WFB4mnhBWhyQ/etXuLgYyY1J1Nsq 8A41VYEvw4JTpTtlekOyjwA8UwGfRMSJKfDM3sNrTOTEFeEuOqo1ZzP6l4jNSaYiJok/ jArZKASE1cH1zZDVxNufJAiXgcI9Ep28UMshw1mL+wlXemAt9HcrTCHipFFo9H7X2Hfg HfZPsTOWxMBm5DGEzqcrPCSA9GMFhtkpPjZSzNFndeJRNowkJLv4y1KVgjGNdZx/MiDs vqu2X4mng3CusMN5iGHZyh7PDsYwIe95BVSGVRbnnjHrO3cS90FV121bxsrT4hwx3Lhg o28w== X-Gm-Message-State: AOAM531AKhnvLPgkamU6/RdUprXEmru1GdZkuIc1xfn3dsxg/TTZgFhN Qm9+RWL4/Nd+ePBoMUMTwh0OMYCT X-Google-Smtp-Source: ABdhPJypP+LDCo1790kurROrmrhvJFMcEyoZB8Gh+1yNQAwT/ArjLmuAaZmmhAC97vCsPaBrVdHSSw== X-Received: by 2002:a1c:6604:: with SMTP id a4mr10401946wmc.81.1595763681545; Sun, 26 Jul 2020 04:41:21 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h199sm14068068wme.42.2020.07.26.04.41.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 04:41:21 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 19:41:15 +0800 Message-Id: <1595763675-1857-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595763675-1857-1-git-send-email-mypopydev@gmail.com> References: <1595763675-1857-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] lavf/vaapi_encode: export encoded frame stats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Export choosen pict_type. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 6766641..2352fdd 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -24,6 +24,7 @@ #include "libavutil/log.h" #include "libavutil/pixdesc.h" +#include "packet_internal.h" #include "vaapi_encode.h" #include "encode.h" #include "avcodec.h" @@ -633,6 +634,7 @@ static int vaapi_encode_output(AVCodecContext *avctx, int total_size = 0; uint8_t *ptr; int err; + int pict_type; err = vaapi_encode_wait(avctx, pic); if (err < 0) @@ -670,6 +672,28 @@ static int vaapi_encode_output(AVCodecContext *avctx, pkt->pts = pic->pts; + switch (pic->type) { + case PICTURE_TYPE_IDR: + case PICTURE_TYPE_I: + pict_type = AV_PICTURE_TYPE_I; + break; + case PICTURE_TYPE_P: + pict_type = AV_PICTURE_TYPE_P; + break; + case PICTURE_TYPE_B: + pict_type = AV_PICTURE_TYPE_B; + break; + default: + pict_type = AV_PICTURE_TYPE_NONE; + break; + } +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->pict_type = pict_type; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + ff_side_data_set_encoder_stats(pkt, -1, NULL, 0, pict_type); + vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer); if (vas != VA_STATUS_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: "