From patchwork Sun Jul 26 12:26:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21270 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 2CFB544A760 for ; Sun, 26 Jul 2020 15:26:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18B2868B605; Sun, 26 Jul 2020 15:26:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38DFA68B5CF for ; Sun, 26 Jul 2020 15:26:35 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id a5so2226760wrm.6 for ; Sun, 26 Jul 2020 05:26:35 -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=pc9sVnDeirdP2iojJYQCIOPBiokab2204mPDO2v9fAFopkfYB79Zd79shsLOoKlrnr BNk8N2wcM9Xyh2J0v8QPN+mxwrDbc0jTEaHx7cj20+wWEUobYfVb59KCkRGv7oEbQce1 41jlEzCRqM4omgOr/411fYPuVw9EZ0VChR9zVLSEwNX6Q1TztEw6U5IQ59ZJfQl1XeZR erWZzYlfn4VfJ0UBxaxcHgme52ATjHoRVbr8o7nLGmmAu/IFa6pa07c3wp1LCB7q1eqQ NVSfdL1sO4jW5VeAYTzkIik94Iyqg+CMJCGPFsnEVVzKE3VHSmCOzEt0hHKTYjMrefla EK4Q== 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=hIfwnytVGPW05+fVeBrwrw1pLUT5plEy0VrqS970YNqoJ8rFHGevzW8pmiQfVPjeRp ZgsCkCxz9r5L89f2GRr75h/Zgd3mclJNqfYF737ono7r31xaa4Eate45q9zNknKqfdSZ kMEit5DS+sdIV/VOIfJo/i3EKDS1anBH+YLnvM5Ax3KLPIKPlLvS6ftNLcqlwkHYFNjn aYHrfvWFs5FAd77SbTy2crKyqV0/8BhxNHLL53eeKsffGNw67rWuzaSET9mkm10G0C5G s+ZdbeSLU9oc3GuQgUq0W9y+9CukkDMawd8VluflhctKdQdU5/6gssT+HTUWN7Ukd9Jv jSOg== X-Gm-Message-State: AOAM530RLZbG1NCejXOiZ70eIlUWvcj3vM+NN/qzRcxts/WglM+rvTB3 OApRA7Rllspl9o16u11rX37KJjUZ X-Google-Smtp-Source: ABdhPJyeGEVe/Qj+N/74VieF/skxG96OHfMYZ96KHWs30ILY1+jUxhOYC8J0z2AH3DqtrntZMVHtJQ== X-Received: by 2002:adf:de07:: with SMTP id b7mr17511797wrm.302.1595766394572; Sun, 26 Jul 2020 05:26:34 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id j6sm8506576wro.25.2020.07.26.05.26.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 05:26:34 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 20:26:07 +0800 Message-Id: <1595766367-8861-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1595766367-8861-1-git-send-email-mypopydev@gmail.com> References: <1595766367-8861-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] lavc/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: "