From patchwork Sun Feb 2 22:23:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 17674 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 CDD4444A6E2 for ; Mon, 3 Feb 2020 00:31:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BAA27687FD1; Mon, 3 Feb 2020 00:31:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A292D687F8E for ; Mon, 3 Feb 2020 00:31:43 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id v195so12373182qkb.11 for ; Sun, 02 Feb 2020 14:31:43 -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=OpHo8VspmvtAr5pgZh531oUAVNxl97miGYEgEWhM4jQ=; b=q4M8kE5iS517rxiDLv1RdOO6ca/mSSSdkdBwlFnS7/QlWsIulJSiz67BWoPOyKpCCr +4nyKTxHJ/0MSPuRGW3FZdXmdZlSN+q/BOuvyc+BT398fAa8sG3z+Id3SiY/O6L7EdNV 327/b3oPECDr9F7Blb1dAlGnNu3INh3pl2ch/R2LFulgZ3kV3+b3QAjfCQelrqLae2dn 2DCgbicsC5PeHFztBMFeMrr+JgAKUmr8UgHxzF0secKmOBbFjaVBgk1OstZm7Yb2B2Ag HzDX4JJZk7RmNDtAeknTVKxR8BxaO1kwxyk5ZyInnepcaO5CPeBkI2eIRv93WSqp7q7e dc2g== 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=OpHo8VspmvtAr5pgZh531oUAVNxl97miGYEgEWhM4jQ=; b=WoWLcvA7wBRtD6nngP5OKWuoZkVzsCLaAeD9Hb1cl4hw4dPsoNR2X2+91E4viT0jiN 0/faJn1kN402OmpD0GOE7KNyk2NKsAQvGmG0e/3JOcEFefl+RTdIgTdkKoedYWLFx/Ad /pPOu5rs0ZFhr3zU3/A3ugrOhCmVL4VeWpHDEYd7XizVCSUpdFnNH3Nx7KTRYJp2ybO3 uT/sS6L124VHMlIPb8FGl68br7lWMYJuhG9Kh/labhXo4HV8MBlJMgh302xbIcPbcHNs Vi4/5DpI8hehZyf/LHvVo2C6HRGcMjDjBc216X0mSvtt0AfRNnSnQe/xxK15sYZ7i/+Z CrbA== X-Gm-Message-State: APjAAAWw1e6P/O/xuL39QZw1DZyDGqcITaQIze69HhsNmEN9pzHmTaVH IegwaHZ3BCx04MmWVUZKwN0kotyg X-Google-Smtp-Source: APXvYqzaYiMeDVrdxOmBPWHi9BK1G/CCn6/uMDPJdB5qUwHeUw9DWila7rcI5MX3U9PeeT0z5ir3/Q== X-Received: by 2002:ae9:e649:: with SMTP id x9mr20258604qkl.405.1580682243500; Sun, 02 Feb 2020 14:24:03 -0800 (PST) Received: from localhost.localdomain ([191.83.214.69]) by smtp.gmail.com with ESMTPSA id z26sm8913184qtj.12.2020.02.02.14.24.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 14:24:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Feb 2020 19:23:07 -0300 Message-Id: <20200202222307.10074-3-jamrial@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200202222307.10074-1-jamrial@gmail.com> References: <20200202222307.10074-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: add a check for the export_prft AVCodecContext flag 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 --- libavcodec/libx264.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index ca8f6c0873..a08fe0ce76 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -322,7 +322,9 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x4->pic.i_pts = frame->pts; x4->reordered_opaque[x4->next_reordered_opaque].reordered_opaque = frame->reordered_opaque; - x4->reordered_opaque[x4->next_reordered_opaque].wallclock = av_gettime(); + x4->reordered_opaque[x4->next_reordered_opaque].wallclock = wallclock; + if (ctx->export_side_data & AV_CODEC_EXPORT_DATA_PRFT) + 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;