From patchwork Sun Jul 26 11:41:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21263 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 74BEA44B5F6 for ; Sun, 26 Jul 2020 14:41:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5861668B629; Sun, 26 Jul 2020 14:41:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF24A68B627 for ; Sun, 26 Jul 2020 14:41:21 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id f18so12065042wml.3 for ; Sun, 26 Jul 2020 04:41:21 -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=fpz+0Jdc2NJN1+pkZEckIW+DvW3K+md91aBBnOnPMBk=; b=NZfZRuVZDIlnqwrxwGmisyNrLYkQOWlJ5yx35rCazOzPl35h1QrvhIMdehIdcxZB8+ X1EJok3GGpHatF31+wpep4rdGDIarJrRJspNfMhU/4/+71nFqdHK/OfIyyf1r63gGEGY 6C+BVZf1OJ9MMMlWYazpKDR7kWKeUUvtbta7qcNtHtlPumYf250BPJ5WGr72CRK/5oYN 34ImFPbTn7ni7tc2Zpq3qi9hT1QsNE+rFQpcHtcVURBO4r5aWl7/pZbTkIlG78TWtGwp 6RG6FYutTlpUPEYkykBsZJq0zVeGFJXcrGw0bzUqjT3qsxwWxy+x7MFSl45geRcoaep+ u5jQ== 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=fpz+0Jdc2NJN1+pkZEckIW+DvW3K+md91aBBnOnPMBk=; b=LFsn8oQSnQ+W7pFN649tcoKlZ0Z4vqTEArnSYcN51Yl2MObVWWfYmZzsermSZq8I0P 3rf1w6CYCY/tGC2xdY9aDNZEMisnLtX7cT8Cv+ZUR+4sttAvIqstOGA9pOuw7wHMWlug /ojiq5fiK97XZPoi4oCqciMi1LdJ1teQaiem/DOBmz+Sz9/hqBdq5Tpziow3LBAnmE8N IFxtX2fiYUuNcZJICCADZSJFjFIxVUi0Ote6FoTs9e9TnnopHhm175Jw1kZpPQwAJtda dw51QJb6kgBtssw8EbHI9Hs0Zj+4bhBsm89vN/DE3+hRytquacnI5EqVSwPJpjcVkc64 yWgQ== X-Gm-Message-State: AOAM5337uVvoioMoAY/3GIRgqeSMKBqd2mvtx9sat3haauLYsvUMMbf8 /cUDycEFRs6M147KupcDsVkp3bNN X-Google-Smtp-Source: ABdhPJwG34bwC9Xzc2CVmqmF6po+ll4MrzhlQc9lc0ELvZehRKIDqZGO29tGe/ssszpShyBPj9UFqA== X-Received: by 2002:a1c:f219:: with SMTP id s25mr15689941wmc.2.1595763680999; 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.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Jul 2020 04:41:20 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 19:41:14 +0800 Message-Id: <1595763675-1857-4-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 4/5] lavc/openh264enc: 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. NOTE: now libopenh264enc always export the the average QP with zero. And I have opened a issue for libopenh264 in https://github.com/cisco/openh264/issues/3317 Signed-off-by: Jun Zhao --- libavcodec/libopenh264enc.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index cf48566..5d934b4 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -31,6 +31,7 @@ #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #include "libopenh264.h" #if !OPENH264_VER_AT_LEAST(1, 6) @@ -376,6 +377,8 @@ static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, SSourcePicture sp = { 0 }; int size = 0, layer, first_layer = 0; int layer_size[MAX_LAYER_NUM_OF_FRAME] = { 0 }; + int pict_type; + SEncoderStatistics stat = { 0 }; sp.iColorFormat = videoFormatI420; for (i = 0; i < 3; i++) { @@ -426,6 +429,34 @@ static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, avpkt->pts = frame->pts; if (fbi.eFrameType == videoFrameTypeIDR) avpkt->flags |= AV_PKT_FLAG_KEY; + + (*s->encoder)->GetOption(s->encoder, ENCODER_OPTION_GET_STATISTICS, &stat); + switch (fbi.eFrameType) { + case videoFrameTypeIDR: + case videoFrameTypeI: + pict_type = AV_PICTURE_TYPE_I; + break; + case videoFrameTypeP: + pict_type = AV_PICTURE_TYPE_P; + 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, stat.uiAverageFrameQP * FF_QP2LAMBDA, NULL, 0, pict_type); + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->quality = stat.uiAverageFrameQP * FF_QP2LAMBDA; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + *got_packet = 1; return 0; }