From patchwork Sun Jul 26 12:26:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 21269 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 77B0644A760 for ; Sun, 26 Jul 2020 15:26:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 67AE368B617; Sun, 26 Jul 2020 15:26:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E02A68B474 for ; Sun, 26 Jul 2020 15:26:34 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r2so7130387wrs.8 for ; Sun, 26 Jul 2020 05:26:34 -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=WSH1mXWX0DaNSz/B29/fNxH7LackBe3rdK1u3HAL6Q65z/7D/5tXkgeA9w0gU9EqsJ WZ6M0F3XhcMBkG6DkeSMbZQDhe8N0tI2Le+Xc+Po/D0+mty3j974OAKw484QS3qdc2iB MvT8SZH6KN4HT1uom5v8+ra+c/VY6HgOb49Efxw5/YCeTUGxVeFBSa2Qq3ZOAqUFDtaK KKNvZ7lwCIntpQkVAeb+MgwYH75MDNcx+87QDnN6528fYcB1G6QJMJ3/vSagVqxWLNgI D+4d96hx4Amf0l+Gc8tEWWhRn0M8g58IHE0XdeKcRSlGwhc9C3BUaT4n9lCQRatBge2Q 6Wwg== 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=N+DuajijTtsZ+YhU2iR93KlTJkDgLblpwWZ3VfKnSeYHh3AkWMtDoDfmKf/F7B4708 ZlYh7y0GG347m2AaZuSL+P1NCx9gMv8vFgLmKLLXxc6hSQ236ETRdPUrLCveSu5+AtL6 MTX3f1UzTdWM2aiVSxZ4jyn8FMfV9+3uJWczZ8P2JvLzm64w+Oo5WBD3JLFHiPSkkz9v +8hyYv835frbvSjgLtuI//7+y6EzaUDJI/fwWKr5cxzi67OGWv1smI705HAMmFVQIELG Vr4SA+q17yw6lfEViLdGOjYwyVCzWb6uZ6f4iXcPb7A/Y6fba987PBgA2sYhO4CPCTCN N1Tw== X-Gm-Message-State: AOAM531Le/7oZFAU7hg56WNFlkeCg2Yl5fS39Nra2Xta60Sl5M4sMTCR Q5pHU4T4wH3oCffzrOhnOJwm7S8B X-Google-Smtp-Source: ABdhPJxjR4mVW+dRitqTe68g5bRMxoRBTGjjBgzja2N82ai7nYq/i5jbSjB5ydN3FH26U62EvN4/jw== X-Received: by 2002:adf:c401:: with SMTP id v1mr15501850wrf.379.1595766393886; Sun, 26 Jul 2020 05:26:33 -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:33 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Jul 2020 20:26:06 +0800 Message-Id: <1595766367-8861-4-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 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; }