From patchwork Sat Dec 21 18:02:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16907 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 87C9444958D for ; Sat, 21 Dec 2019 20:03:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7132968A9AA; Sat, 21 Dec 2019 20:03:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AD9D68A6D0 for ; Sat, 21 Dec 2019 20:03:35 +0200 (EET) Received: by mail-pl1-f174.google.com with SMTP id b22so5473099pls.12 for ; Sat, 21 Dec 2019 10:03:35 -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=C7iyHDB3E7mxcBQ981Q4h3rd1cTwhp4q3sds8knWL8o=; b=mHH1AM7o7IvcfLypTNtXLGZ5OaTmPeNGRaOw2LGiPLneyTDqCwSrR39LW/eXTMxsHJ pcmp9igQxjx9yeiMnU41WqutRoMjJ9ypXuBb1QTxQr7nRxJjpqGajDIy6b6T5Wogtlj9 GzNFZIDwrvNKHKfQue/hjf6dv/8dQ9xVs9Qx9oXubC5AYVykhJ9jDqCl9UzWHsCZKVDC cu6IqwAvtCw76S+ltllmH3CYYbVxQMtosPz3cEaFoWHcEd7vd5BKUhocfhZ+lFRcn4Y7 ocTRCI38eIRJxu+6Y62w0Tv7tsUhs1Z5Hi30po8zbEMqRGnS/f4i9wYAN8bL54e5TveD z/Bw== 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=C7iyHDB3E7mxcBQ981Q4h3rd1cTwhp4q3sds8knWL8o=; b=S5S0b8cbBcaOSRGfJXhd6Ikayzco7la8d7i7Av0FMf0E6wS+t/7aBFWVGpQAM8jF6I nwYUOPOKjfBVyQAD6avbp3R4CeS9Yix7CIn4MPumCRpBDwn1hYJ2uYLG1QMCdb1UH6tt I65LJn158QLjKdIxbP59YDlsyKL/rMSJqp8kzORuxlAJJQpDUrKNw20KjMOlkxgQagAB 5KXpG+ke13oseb+EyPH/SBcn/FCv3AD+UYFnQkekHPZS1nkmorMRypKH3AU3xNSvxKxP rHbuhocKF8/mJzDBBOnq+4D5ez5fAoYgdkWbT4F2SMjyInFQ78fYz2gTjVoeq/Frci2q DTrQ== X-Gm-Message-State: APjAAAUNY/UKAJCahYnuB1lsvZ7mHg8chMhWgeowaOK2IxTN8p4szYcR /LmoztBR8+dHGwEvS2oxJ64MYrF2 X-Google-Smtp-Source: APXvYqwNbip9hV2YQj6MD4+XZdSaB2yWIla7KfV5S5Tb2DLZL54kKdJZwdPIF0X+sochQz8pV4hTuA== X-Received: by 2002:a17:902:6948:: with SMTP id k8mr21599230plt.223.1576951413449; Sat, 21 Dec 2019 10:03:33 -0800 (PST) Received: from localhost.localdomain ([191.83.216.116]) by smtp.gmail.com with ESMTPSA id s196sm18223564pfs.136.2019.12.21.10.03.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Dec 2019 10:03:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Dec 2019 15:02:42 -0300 Message-Id: <20191221180252.6091-5-jamrial@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191221180252.6091-1-jamrial@gmail.com> References: <20191221180252.6091-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] avcodec/libx264: export Producer Reference Time as packet side data 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" Taken from Wallclock at the time the frame is submitted to the encoder. Signed-off-by: James Almer --- libavcodec/libx264.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index bfd91bb900..846b78c319 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -25,6 +25,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" +#include "libavutil/time.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" @@ -44,6 +45,11 @@ // blocks of pixels (with respect to the luma plane) #define MB_SIZE 16 +typedef struct X264Opaque { + int64_t reordered_opaque; + int64_t wallclock; +} X264Opaque; + typedef struct X264Context { AVClass *class; x264_param_t params; @@ -98,7 +104,7 @@ typedef struct X264Context { char *x264_params; int nb_reordered_opaque, next_reordered_opaque; - int64_t *reordered_opaque; + X264Opaque *reordered_opaque; /** * If the encoder does not support ROI then warn the first time we @@ -292,7 +298,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x264_picture_t pic_out = {0}; int pict_type; int bit_depth; - int64_t *out_opaque; + int64_t wallclock = 0; + X264Opaque *out_opaque; AVFrameSideData *sd; x264_picture_init( &x4->pic ); @@ -314,7 +321,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x4->pic.i_pts = frame->pts; - x4->reordered_opaque[x4->next_reordered_opaque] = frame->reordered_opaque; + x4->reordered_opaque[x4->next_reordered_opaque].reordered_opaque = frame->reordered_opaque; + x4->reordered_opaque[x4->next_reordered_opaque].wallclock = av_gettime(); x4->pic.opaque = &x4->reordered_opaque[x4->next_reordered_opaque]; x4->next_reordered_opaque++; x4->next_reordered_opaque %= x4->nb_reordered_opaque; @@ -443,7 +451,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, out_opaque = pic_out.opaque; if (out_opaque >= x4->reordered_opaque && out_opaque < &x4->reordered_opaque[x4->nb_reordered_opaque]) { - ctx->reordered_opaque = *out_opaque; + ctx->reordered_opaque = out_opaque->reordered_opaque; + wallclock = out_opaque->wallclock; } else { // Unexpected opaque pointer on picture output ctx->reordered_opaque = 0; @@ -473,6 +482,8 @@ FF_ENABLE_DEPRECATION_WARNINGS pkt->flags |= AV_PKT_FLAG_KEY*pic_out.b_keyframe; if (ret) { ff_side_data_set_encoder_stats(pkt, (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA, NULL, 0, pict_type); + if (wallclock) + ff_side_data_set_prft(pkt, wallclock); #if FF_API_CODED_FRAME FF_DISABLE_DEPRECATION_WARNINGS