From patchwork Thu Jan 23 20:25:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 17497 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 6F16144ABD7 for ; Thu, 23 Jan 2020 22:32:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F02168ADB3; Thu, 23 Jan 2020 22:32:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B243368AC21 for ; Thu, 23 Jan 2020 22:32:04 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id c17so4833122qkg.7 for ; Thu, 23 Jan 2020 12:32:04 -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=wHoU5RnV6S5NXJaMLn7WpuEHBKUcdfhHC0oAutl87T0=; b=suC7wO+PMVjnf5ydLiRSuIyoxzxxF9hTwdiqL7/b60xlAm94hG36TPs2uSGxp8QE0u 9rkTZlbjBmHipeB7mob+juyfvAt0gjfbPIOUdSm9Jjflujc8JHpIalTxJrUavSapLqzv dUiz66VE5i3f41HKSjEMLMkximlWbAziTIcHUBT6DBFWiAFQMzkH2wXGNkH8c+ArHEeL 3Btgt6k2zwi4G24kvX5Q4xisI9xeGom4ryF07V9+9aQ0JonDKLMod2n+rvczc57pOOZ9 dOTorMBBQ/AAjkBdVMR9JNziSjIw0hliUeHX91urGagSdPUJrFnDTyl2E2Y8mKQRirh/ JWVQ== 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=wHoU5RnV6S5NXJaMLn7WpuEHBKUcdfhHC0oAutl87T0=; b=F/EwBRcrQ/5rwvT+deu8LKTDkPRXbo5ncQo7N2flHQ1u7g63lVIUJF9huxCN+lyq0G D30y6ZU2NolDTNo1oa2u4i8Tv63dujb1w/PSROZocUX2yvux/zLzYTq0M64dSiBl2iRY PLsKYdQ389ALsZ39+DDGOexpNCYB760QouvewMSv6pNpLp0dfikvAippcJiw4tauYstT hI6JUzQB5XjFKVCX1H3pClS0t3+EfUuVUFpPpzVdcvDKCUc4x1w+Gh+VwNIsjVLx4Tji Mnc7f6PLFwu8OxuhZ5jE4lpyRQFhVVJDAQh5VCJUMcJtakmpMFHzxHTWLXCGwq2TJGZD Z0KA== X-Gm-Message-State: APjAAAUFA3RuCqJ/YG/FMhpDhH4fkLJquC9w5ZU4rzrrl3Licr0qc5Bk a3E6Qf8P8SwR/B7C3r2VylKqlfhv X-Google-Smtp-Source: APXvYqxWxDlVZiht71S6htU6k+yTY8teZf73K/noXwX9GhH5t2BLJ6D6Yzcu1YkHimOwEK3DUvUiqA== X-Received: by 2002:a05:620a:2041:: with SMTP id d1mr18238100qka.113.1579811157610; Thu, 23 Jan 2020 12:25:57 -0800 (PST) Received: from localhost.localdomain ([191.83.216.198]) by smtp.gmail.com with ESMTPSA id a200sm1566926qkc.2.2020.01.23.12.25.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 12:25:57 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jan 2020 17:25:35 -0300 Message-Id: <20200123202535.232-2-jamrial@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200123202535.232-1-jamrial@gmail.com> References: <20200123202535.232-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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..7cb716e13d 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->flags2 & AV_CODEC_FLAG2_EXPORT_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;