From patchwork Mon Dec 30 19:20:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 17074 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 2604A448545 for ; Mon, 30 Dec 2019 21:21:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16B9868ACDC; Mon, 30 Dec 2019 21:21:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E894468AC9C for ; Mon, 30 Dec 2019 21:21:01 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id r11so18463082pgf.1 for ; Mon, 30 Dec 2019 11:21:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kEBNb4ZjJ2wLKiIwK7l4uV2VPj2v+Sxyta0YthCqvYA=; b=hPsqvreUPGzo9dAmY5u3CpkR+/kc+QMAfTlvNI1ai56y/hf4tN1X0y6KVHduGF3s37 O5IpWLiSHUDhT8S1nwFMGe5O9bJNs4dqPPBaCizdrQjxJ62IrA5/SbkonhITHWj2yNLK MgUb+AfjWdhhSbyas4ppx1AZ4zlerdyqGgAuDIc0JVS+/7krrtMUzSLiZ1K9Agh0rHlS 97mkbeOlv250a79jGskOcl6A4R10l6svRgbLpKWnBcsJTIXF7NMWeILJQWgwfrx55bFG hBTwmHV2AnkRQ4402/hzjGmbr98uLVzp2aO6y4fXCmZyHrIQyslCFxktZgHqZEPSVf4r NTvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kEBNb4ZjJ2wLKiIwK7l4uV2VPj2v+Sxyta0YthCqvYA=; b=c7UtHEJUw+opr96HkOmjGH86yHGxxJx4q7l/5XW7Wn3JJFMRjE5KrMdmKDfIrMPt6X S0cbTJ5U3Zx7eNVi5B/WXk9XRSugJz17b9VZqn75RWgD0soKSlXVXdJyrFmA3onP+abV 1BiL8em5UZ/RGNnsOD/9nXhwLsBK8CAKIctIZXM8WL9eoKA8XNE1Xrf1R+fC9eEXj0fC yTxmi2triU/Ww+9lcO80GCdfFLHVJHTPJqInuVYvLXKwcbRiDmQEdMF3SHFZakHWmQdK Xed6+sMJSVL3uXuScqrLzojgpvyd6F2aVkE6jlLwpERYT91FNf1i8USm3+8VPyh4vmUV BMnQ== X-Gm-Message-State: APjAAAWQsZUQ2WOs0QAi2HI/Y4yPFLd2zE6Ptu8Um93q5F7zJD3pEWZR anE3N0RhaH2pynPaeG+umkRKPVkD X-Google-Smtp-Source: APXvYqwPfjQFvTQJUsyjrpoxrILZnthMYBDT794AulCA0qC+qVIlGmEhDquDR5PEYiT4YoaOHR22uA== X-Received: by 2002:a63:338e:: with SMTP id z136mr74241897pgz.60.1577733659720; Mon, 30 Dec 2019 11:20:59 -0800 (PST) Received: from localhost.localdomain ([181.23.77.192]) by smtp.gmail.com with ESMTPSA id p17sm51275102pfn.31.2019.12.30.11.20.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 11:20:59 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Dec 2019 16:20:08 -0300 Message-Id: <20191230192009.2462-3-jamrial@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191230192009.2462-1-jamrial@gmail.com> References: <20191230192009.2462-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4 v2] avcodec/libx265: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- No changes. libavcodec/libx265.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 9646e208f4..a97bf19e91 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -484,6 +484,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, x265_picture x265pic_out = { 0 }; x265_nal *nal; uint8_t *dst; + int pict_type; int payload = 0; int nnal; int ret; @@ -543,20 +544,23 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pkt->pts = x265pic_out.pts; pkt->dts = x265pic_out.dts; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS switch (x265pic_out.sliceType) { case X265_TYPE_IDR: case X265_TYPE_I: - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + pict_type = AV_PICTURE_TYPE_I; break; case X265_TYPE_P: - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; + pict_type = AV_PICTURE_TYPE_P; break; case X265_TYPE_B: - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B; + case X265_TYPE_BREF: + pict_type = AV_PICTURE_TYPE_B; break; } + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->pict_type = pict_type; FF_ENABLE_DEPRECATION_WARNINGS #endif @@ -567,6 +571,8 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif pkt->flags |= AV_PKT_FLAG_DISPOSABLE; + ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type); + *got_packet = 1; return 0; }