From patchwork Sun Jul 26 11:41:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21271 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 4617044A7DA for ; Sun, 26 Jul 2020 15:45:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2172C68B474; Sun, 26 Jul 2020 15:45:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6093268B017 for ; Sun, 26 Jul 2020 15:44:58 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id y3so12239782wrl.4 for ; Sun, 26 Jul 2020 05:44:58 -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=Zh6bwPcTswKfiT0lr6KaMqfpor/0FGPvQiemLJnoFF4=; b=MbmpMHv9pjoHlh6xBywJfI+1FPMHfyUosRlR8JheUvtygi0ni8SQz8NsJvUSXN2Awo dmv42wHZErBJxtMY51j/oQlWCCWwaCi2+lTNhV/vVzXOFsxLuWURCrdNNHa8GSjyFlF2 ZESnIaS651JwTV6Bqt0yGrJVxZ9UyPpalhQdjtILNhfhh1cylxsQ1IoBiMidqy0jMvUx L9zZySqy6bD83C590GhAtfddFRfBQtiZZT/viRchqZNGu3xnZQ2xFmX88MZaWdK1sNlT 1O4Mzst5+VYRO5l7X/HUrNnOwtFiicG5jj9xfp8p0PvCbUXB9H2gUa1M57WRXCdHx1Y9 Z6Wg== 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=Zh6bwPcTswKfiT0lr6KaMqfpor/0FGPvQiemLJnoFF4=; b=WYDhY5zdVqBKvt9Oc0AK1Csa8gzQZ/XW0exfAAv8KGY+JKjb70BDLInv+RrkKBPH2q ckQ4PXO0OZrvXnjd+NsUFowblUThrQ/dNhFqzQwJCkzDNqf+D4bYHS5YdMVWhxTxOqAi 2j0lXEwpDqVELtILWnjPa0opR3GA0N3zgavkFagXTowbFjIzbONQsUmZ2g9JSI86DrO5 QXZcD3WzgQWmdM2XEgOIuUirRwud9AxBkYcKwedm3qY0WWLedVIrU8WfBaAdrtDsPe7o 0jWsNDycjnNkEQCDuCyYWleOqBG+SqZnpFIbi9hj4/zfAnzjFHWMkl3dQicNpwqEONLl OrNw== X-Gm-Message-State: AOAM532dKc2YLuRR4ahrVWWhOaIVugNzcFZYMg9Fch5MzR6f+UE299lz CThUHHMKRPTuani2qwtzgMh617oB X-Google-Smtp-Source: ABdhPJymgxT25dAqmJNaX45Qt5jwndrlYXYBcOPAGfkZbQPpR2yURSegjmoHRzD0HA9cEPOcO8Z1Yg== X-Received: by 2002:adf:ebc5:: with SMTP id v5mr12140895wrn.100.1595763680286; Sun, 26 Jul 2020 04:41:20 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h199sm14068068wme.42.2020.07.26.04.41.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 04:41:19 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 19:41:13 +0800 Message-Id: <1595763675-1857-3-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 3/5] lavf/libkvazaar: 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 and qp. Signed-off-by: Jun Zhao --- libavcodec/libkvazaar.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 71c9c8f..9032547 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -37,6 +37,7 @@ #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" typedef struct LibkvazaarContext { const AVClass *class; @@ -170,6 +171,7 @@ static int libkvazaar_encode(AVCodecContext *avctx, kvz_data_chunk *data_out = NULL; uint32_t len_out = 0; int retval = 0; + int pict_type; *got_packet_ptr = 0; @@ -257,6 +259,34 @@ static int libkvazaar_encode(AVCodecContext *avctx, avpkt->flags |= AV_PKT_FLAG_KEY; } + switch (frame_info.slice_type) { + case KVZ_SLICE_I: + pict_type = AV_PICTURE_TYPE_I; + break; + case KVZ_SLICE_P: + pict_type = AV_PICTURE_TYPE_P; + break; + case KVZ_SLICE_B: + pict_type = AV_PICTURE_TYPE_B; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown picture type encountered.\n"); + return AVERROR_EXTERNAL; + } +#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(avpkt, frame_info.qp * FF_QP2LAMBDA, NULL, 0, pict_type); + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->quality = frame_info.qp * FF_QP2LAMBDA; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + *got_packet_ptr = 1; }