From patchwork Mon Feb 10 18:26:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 17751 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 C9EB744ADB0 for ; Mon, 10 Feb 2020 20:55:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAB6C68AFEF; Mon, 10 Feb 2020 20:55:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f195.google.com (mail-vk1-f195.google.com [209.85.221.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA92B68A9F3 for ; Mon, 10 Feb 2020 20:55:01 +0200 (EET) Received: by mail-vk1-f195.google.com with SMTP id i78so2096987vke.0 for ; Mon, 10 Feb 2020 10:55: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=OpHo8VspmvtAr5pgZh531oUAVNxl97miGYEgEWhM4jQ=; b=MHnp2bLnWbe3ZTw8piI5I3gZoKgcsHjjMupZ2CbzhhALfyqINv0tpS3LA6vn+1jh4e tvStd7pIr8dcOJFYA/jbhkWyKoEUQxIQu74JRUoVveY+6f+OJTUQQHixClhpfKUaUIki 3VVqx6ztRHYMKm6cxHXRChx97g9v+t9DuYSV+FdWii0g7bnF0Cq2POe1/1V3kegyc8gB +iHpCtTvyRDp9W3XT6XiE/uElVgP4M6cAeAOdTt4o0e4pnkwU09iwdpo6nBVaTZ1IJkm biNJKQX6gIFHXkRr2QLTIPRAnvX7GSuPiVv4HZQ2ECQtkvkI+LmN9dFrUXcPEb1Nyaol 0n/Q== 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=hVAFRaE3RRab5D3KXOQ/6gVRAyTtzg8Qr2uJnaSRglRDrET51zCLeuNsq90md6G7cc 06+pXdfIEQKEFCif+PwiF5rEmC+ewGSmplpHo9PjT+ariq7bpfD8gQSzL4inAOcp7D19 Fef8TXUIy5dFxnCHm+K55nCi7Lz8UYUzWRBEcMfTHIXNkYFx0y3/ggtMPgxhvYXtGAcE 45QrVZmcJUsUvWpgg7gBcy1jaMYKOMji+MUQxXllYRrHlZHSAio63HpTGd3VjHdu43H4 kQkWTosSbJKfZ/8h5YRWmEmhbv5YdfsWWishG0TIhcXb/7+pNlsaGUeKKq5132S//E9P WrGQ== X-Gm-Message-State: APjAAAXsPczrvmvOmnfFUoh6mHfbpLlmNVs+Wv3fr4+S2tVyoKNn+ADb 4+QAGzPZ5sEeVFEng4/mKTe/UVCePdc= X-Google-Smtp-Source: APXvYqwIbvuUuoR/381g6JpmrlczsGlLsVvX5H6bvXmOIck3NzqBrgKeUmqM6X9TzARzl5eizbhU5w== X-Received: by 2002:a0c:8605:: with SMTP id p5mr11184248qva.109.1581359275906; Mon, 10 Feb 2020 10:27:55 -0800 (PST) Received: from localhost.localdomain ([191.83.217.165]) by smtp.gmail.com with ESMTPSA id w131sm118926qkb.18.2020.02.10.10.27.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2020 10:27:55 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Feb 2020 15:26:46 -0300 Message-Id: <20200210182646.17593-3-jamrial@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210182646.17593-1-jamrial@gmail.com> References: <20200210182646.17593-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/libx264: add a check for the prft AVCodecContext export_side_data 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;